From d40b012ed523669eaf8dcf25c6d5cdea2d32e084 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Fri, 30 Mar 2012 15:48:44 +0300 Subject: [PATCH] gles: don't call unsupported glGetHandleARB MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GLES doesn't support this call, so do not call it. Signed-off-by: Imre Deak Signed-off-by: José Fonseca --- glstate.cpp | 2 +- glstate_internal.hpp | 2 +- glstate_shaders.cpp | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/glstate.cpp b/glstate.cpp index 9c3d4d5..0d5a5f3 100644 --- a/glstate.cpp +++ b/glstate.cpp @@ -135,7 +135,7 @@ void dumpCurrentContext(std::ostream &os) Context context; dumpParameters(json, context); - dumpShadersUniforms(json); + dumpShadersUniforms(json, context); dumpTextures(json, context); dumpFramebuffer(json, context); diff --git a/glstate_internal.hpp b/glstate_internal.hpp index ddc802e..aab7f98 100644 --- a/glstate_internal.hpp +++ b/glstate_internal.hpp @@ -58,7 +58,7 @@ void dumpEnum(JSONWriter &json, GLenum pname); void dumpParameters(JSONWriter &json, Context &context); -void dumpShadersUniforms(JSONWriter &json); +void dumpShadersUniforms(JSONWriter &json, Context &context); void dumpTextures(JSONWriter &json, Context &context); diff --git a/glstate_shaders.cpp b/glstate_shaders.cpp index 90e5d0a..11286fb 100644 --- a/glstate_shaders.cpp +++ b/glstate_shaders.cpp @@ -491,12 +491,15 @@ dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix) void -dumpShadersUniforms(JSONWriter &json) +dumpShadersUniforms(JSONWriter &json, Context &context) { GLint program = 0; glGetIntegerv(GL_CURRENT_PROGRAM, &program); - GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB); + GLhandleARB programObj = 0; + if (!context.ES && !program) { + programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB); + } json.beginMember("shaders"); json.beginObject(); -- 2.43.0