Merge branch 'master' into multi-context

[apitrace] / glstate.py

diff --git a/glstate.py b/glstate.py
index db0152feea92fc42a8826551f2ab58cc54528274..34405a5e454bbf83450031bbd51e400448057645 100644 (file)
--- a/glstate.py
+++ b/glstate.py
@@ -172,6 +172,8 @@ glGetVertexAttrib = StateGetter('glGetVertexAttrib', {I: 'iv', F: 'fv', D: 'dv',
 glGetTexParameter = StateGetter('glGetTexParameter', {I: 'iv', F: 'fv'})
 glGetTexEnv = StateGetter('glGetTexEnv', {I: 'iv', F: 'fv'})
 glGetTexLevelParameter = StateGetter('glGetTexLevelParameter', {I: 'iv', F: 'fv'})
+glGetShader = StateGetter('glGetShaderiv', {I: 'iv'})
+glGetProgram = StateGetter('glGetProgram', {I: 'iv'})
 glGetProgramARB = StateGetter('glGetProgram', {I: 'iv', F: 'fv', S: 'Stringv'}, 'ARB')