aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRay San <raysan5@gmail.com>2017-12-20 12:35:12 +0100
committerRay San <raysan5@gmail.com>2017-12-20 12:35:12 +0100
commite8bb53ed3520d2219cd7513b9c1fc20908dbf6f6 (patch)
tree8376f69c3adba0e67862f932abc8d6092fd16af8 /src
parent61afd07bd7b3a96c6f0f460b668f52cf1a8bd90f (diff)
downloadraylib-e8bb53ed3520d2219cd7513b9c1fc20908dbf6f6.tar.gz
raylib-e8bb53ed3520d2219cd7513b9c1fc20908dbf6f6.zip
Corrected issue on OpenGL ES compilation
Diffstat (limited to 'src')
-rw-r--r--src/rlgl.c16
-rw-r--r--src/rlgl.h2
2 files changed, 7 insertions, 11 deletions
diff --git a/src/rlgl.c b/src/rlgl.c
index 96932686..8f8a97c1 100644
--- a/src/rlgl.c
+++ b/src/rlgl.c
@@ -35,7 +35,7 @@
*
* 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
* 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
}
- if(strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) {
- debugMarkerSupported = true;
- }
+ // Debug marker support
+ if(strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) debugMarkerSupported = true;
// Clamp mirror wrap mode supported
if (strcmp(extList[i], (const char *)"GL_EXT_texture_mirror_clamp") == 0) texClampMirrorSupported = true;
@@ -1296,7 +1295,9 @@ int rlGetVersion(void)
// Set debug marker
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
@@ -4232,8 +4233,3 @@ void TraceLog(int msgType, const char *text, ...)
if (msgType == LOG_ERROR) exit(1);
}
#endif
-
-void rlSetMarker(const char *text) {
- if(debugMarkerSupported)
- glInsertEventMarkerEXT(0, text); //0 terminated string
-}
diff --git a/src/rlgl.h b/src/rlgl.h
index 2437487d..d3982eb7 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -422,7 +422,7 @@ void rlglClose(void); // De-inititialize rlgl (buffers
void rlglDraw(void); // Update and Draw default buffers (lines, triangles, quads)
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
Vector3 rlUnproject(Vector3 source, Matrix proj, Matrix view); // Get world coordinates from screen coordinates