From 59536d4db0e9496899771593b9e6cac4e61fa220 Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Thu, 27 Apr 2017 13:11:51 +0200 Subject: [PATCH] Skip GL_DEPTH_CLAMP enum usages when in GL ES mode The GL_DEPTH_CLAMP is not valid in GL ES calls. --- renderdoc/driver/gl/gl_driver.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index d7580e890..b7e5156ec 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -1536,7 +1536,8 @@ struct RenderTextState enableBits[2] = gl.glIsEnabled(eGL_CULL_FACE) != 0; if(modern) { - enableBits[3] = gl.glIsEnabled(eGL_DEPTH_CLAMP) != 0; + if(!IsGLES) + enableBits[3] = gl.glIsEnabled(eGL_DEPTH_CLAMP) != 0; if(HasExt[ARB_draw_buffers_blend]) enableBits[4] = gl.glIsEnabledi(eGL_BLEND, 0) != 0; @@ -1655,10 +1656,13 @@ struct RenderTextState if(modern) { - if(enableBits[3]) - gl.glEnable(eGL_DEPTH_CLAMP); - else - gl.glDisable(eGL_DEPTH_CLAMP); + if(!IsGLES) + { + if(enableBits[3]) + gl.glEnable(eGL_DEPTH_CLAMP); + else + gl.glDisable(eGL_DEPTH_CLAMP); + } if(HasExt[ARB_draw_buffers_blend]) { @@ -1887,7 +1891,8 @@ void WrappedOpenGL::RenderOverlayStr(float x, float y, const char *text) // set depth & stencil gl.glDisable(eGL_DEPTH_TEST); - gl.glDisable(eGL_DEPTH_CLAMP); + if(!IsGLES) + gl.glDisable(eGL_DEPTH_CLAMP); gl.glDisable(eGL_STENCIL_TEST); gl.glDisable(eGL_CULL_FACE);