Merge branch 'raysan5:master' into patch-1
This commit is contained in:
commit
fc138d68c3
2 changed files with 19 additions and 23 deletions
|
|
@ -240,6 +240,9 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_ANDROID)
|
|||
ifeq ($(ANDROID_ARCH),x86_64)
|
||||
ANDROID_COMPILER_ARCH = x86_64
|
||||
endif
|
||||
ifndef ANDROID_COMPILER_ARCH
|
||||
$(error ANDROID_COMPILER_ARCH: Unknown ANDROID_ARCH=$(ANDROID_ARCH))
|
||||
endif
|
||||
endif
|
||||
|
||||
# Define raylib graphics api depending on selected platform
|
||||
|
|
|
|||
|
|
@ -896,7 +896,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
|
|||
// It seems OpenGL ES 2.0 instancing entry points are not defined on Raspberry Pi
|
||||
// provided headers (despite being defined in official Khronos GLES2 headers)
|
||||
// TODO: Avoid raylib platform-dependent code on rlgl, it should be a completely portable library
|
||||
#if defined(PLATFORM_DRM)
|
||||
#if defined(PLATFORM_DRM) // Use CONFIG_DRM?
|
||||
typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
|
||||
typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
|
||||
typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor);
|
||||
|
|
|
|||
Loading…
Reference in a new issue