From: José Fonseca <jfonseca@vmware.com>
Date: Sun, 31 Jul 2011 23:18:48 +0000 (+0100)
Subject: Fix shader type from ARB_shader_objects.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=f2c9f6d412ff55dce49152b9d577e4e17954646d;p=apitrace

Fix shader type from ARB_shader_objects.
---

diff --git a/glstate.cpp b/glstate.cpp
index b075509..29ec26d 100644
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -121,8 +121,14 @@ getShaderObjSource(ShaderMap &shaderMap, GLhandleARB shaderObj)
         return;
     }
 
+    GLint object_type = 0;
+    glGetObjectParameterivARB(shaderObj, GL_OBJECT_TYPE_ARB, &object_type);
+    if (object_type != GL_SHADER_OBJECT_ARB) {
+        return;
+    }
+
     GLint shader_type = 0;
-    glGetObjectParameterivARB(shaderObj, GL_OBJECT_TYPE_ARB, &shader_type);
+    glGetObjectParameterivARB(shaderObj, GL_OBJECT_SUBTYPE_ARB, &shader_type);
     if (!shader_type) {
         return;
     }