mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected issue on OpenGL ES compilation

Browse Source
This commit is contained in:
Ray San 2017-12-20 12:35:12 +01:00
parent 61afd07bd7
commit e8bb53ed35
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rlgl.c
View File

@ -35,7 +35,7 @@
* *
* LICENSE: zlib/libpng * LICENSE: zlib/libpng
* *
* Copyright (c) 2014-2017 Ramon Santamaria (@raysan5) * Copyright (c) 2014-2018 Ramon Santamaria (@raysan5)
* *
* This software is provided "as-is", without any express or implied warranty. In no event * This software is provided "as-is", without any express or implied warranty. In no event
* will the authors be held liable for any damages arising from the use of this software. * will the authors be held liable for any damages arising from the use of this software.
@ -1137,9 +1137,8 @@ void rlglInit(int width, int height)
glGetFloatv(0x84FF, &maxAnisotropicLevel); // GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT glGetFloatv(0x84FF, &maxAnisotropicLevel); // GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT
} }
if(strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) { // Debug marker support
debugMarkerSupported = true; if(strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) debugMarkerSupported = true;
}
// Clamp mirror wrap mode supported // Clamp mirror wrap mode supported
if (strcmp(extList[i], (const char *)"GL_EXT_texture_mirror_clamp") == 0) texClampMirrorSupported = true; if (strcmp(extList[i], (const char *)"GL_EXT_texture_mirror_clamp") == 0) texClampMirrorSupported = true;
@ -1296,7 +1295,9 @@ int rlGetVersion(void)
// Set debug marker // Set debug marker
void rlSetDebugMarker(const char *text) void rlSetDebugMarker(const char *text)
{ {
if(debugMarkerSupported) glInsertEventMarkerEXT(0, text); // 0 terminated string #if defined(GRAPHICS_API_OPENGL_33)
if (debugMarkerSupported) glInsertEventMarkerEXT(0, text);
#endif
} }
// Load OpenGL extensions // Load OpenGL extensions
@ -4232,8 +4233,3 @@ void TraceLog(int msgType, const char *text, ...)
if (msgType == LOG_ERROR) exit(1); if (msgType == LOG_ERROR) exit(1);
} }
#endif #endif
void rlSetMarker(const char *text) {
if(debugMarkerSupported)
glInsertEventMarkerEXT(0, text); //0 terminated string
}

2
src/rlgl.h
View File

@ -422,7 +422,7 @@ void rlglClose(void); // De-inititialize rlgl (buffers
void rlglDraw(void); // Update and Draw default buffers (lines, triangles, quads) void rlglDraw(void); // Update and Draw default buffers (lines, triangles, quads)
int rlGetVersion(void); // Returns current OpenGL version int rlGetVersion(void); // Returns current OpenGL version
void rlDebugSetMarker(const char *text); // Set debug marker for analysis void rlSetDebugMarker(const char *text); // Set debug marker for analysis
void rlLoadExtensions(void *loader); // Load OpenGL extensions void rlLoadExtensions(void *loader); // Load OpenGL extensions
Vector3 rlUnproject(Vector3 source, Matrix proj, Matrix view); // Get world coordinates from screen coordinates Vector3 rlUnproject(Vector3 source, Matrix proj, Matrix view); // Get world coordinates from screen coordinates