gles: don't call unsupported glGetHandleARB

GLES doesn't support this call, so do not call it.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>

diff --git a/glstate.cpp b/glstate.cpp
index 9c3d4d5120a7c8e0a50facae14ff312e8ab540b3..0d5a5f3bd629ec2677451098f44060ad5d4525c6 100644 (file)
--- 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 ddc802ef26be996b7e48685e8af12c1d055e4fd9..aab7f986c43a4390c2225b95a2bf7ff1bc526cbe 100644 (file)
--- 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 90e5d0a718a2dcdf0f1c68ca65b0d9a86ef4eef9..11286fb041ec105b8f2f3da7720228b8fed8feb0 100644 (file)
--- 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();