diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-11 16:07:08 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-27 13:35:53 -0700 |
| commit | 75c6f472880706dcbb9d1e20727fa8f71db8b11c (patch) | |
| tree | fae106114612981994bbfb5642aec517929de47b /src/mesa/main/mtypes.h | |
| 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/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index eb8accc8c8..7863ef382d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2141,7 +2141,18 @@ struct gl_shader_program */ struct gl_shader_state { - struct gl_shader_program *CurrentProgram; /**< The user-bound program */ + /** + * Program used for rendering. + */ + struct gl_shader_program *CurrentProgram; + + /** + * Program used by glUniform calls. + * + * Explicitly set by \c glUseProgram and \c glActiveProgramEXT. + */ + struct gl_shader_program *ActiveProgram; + void *MemPool; GLbitfield Flags; /**< Mask of GLSL_x flags */ |