X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glstate_shaders.cpp;h=11286fb041ec105b8f2f3da7720228b8fed8feb0;hb=d40b012ed523669eaf8dcf25c6d5cdea2d32e084;hp=90e5d0a718a2dcdf0f1c68ca65b0d9a86ef4eef9;hpb=ad60fd108d331796173ad54356855d9a2d0d87ba;p=apitrace 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();