diff options
| author | Ian Romanick <[email protected]> | 2010-10-11 16:07:08 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-10-27 13:35:53 -0700 |
| commit | 75c6f472880706dcbb9d1e20727fa8f71db8b11c (patch) | |
| tree | fae106114612981994bbfb5642aec517929de47b /src/mesa/main/get.c | |
| parent | 01abcf3b79c9ba18fef2de423b51e7e1f9bb1b3f (diff) | |
mesa: Track an ActiveProgram distinct from CurrentProgram
ActiveProgram is the GL_EXT_separate_shader_objects state variable
used for glUniform calls. glUseProgram also sets this.
Diffstat (limited to 'src/mesa/main/get.c')
| -rw-r--r-- | src/mesa/main/get.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 39ce177fcd3..da9df27bdb6 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1579,7 +1579,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu break; case GL_CURRENT_PROGRAM: v->value_int = - ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0; + ctx->Shader.ActiveProgram ? ctx->Shader.ActiveProgram->Name : 0; break; case GL_READ_FRAMEBUFFER_BINDING_EXT: v->value_int = ctx->ReadBuffer->Name; |