diff options
| -rw-r--r-- | src/mesa/main/mtypes.h | 16 | ||||
| -rw-r--r-- | src/mesa/shader/shader_api.c | 3 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.c | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index b83beb8f91..bd9198ef12 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1929,9 +1929,11 @@ struct gl_vertex_program_state GLboolean _Enabled; /**< Enabled and valid program? */ GLboolean PointSizeEnabled; /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */ GLboolean TwoSideEnabled; /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */ - struct gl_vertex_program *Current; /**< ptr to currently bound program */ + struct gl_vertex_program *Current; /**< user-bound vertex program */ - /** Currently enabled and valid program (including internal programs) */ + /** Currently enabled and valid program (including internal programs + * and compiled shader programs). + */ struct gl_vertex_program *_Current; GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */ @@ -1962,9 +1964,11 @@ struct gl_fragment_program_state { GLboolean Enabled; /**< User-set fragment program enable flag */ GLboolean _Enabled; /**< Fragment program enabled and valid? */ - struct gl_fragment_program *Current; /**< User-bound program */ + struct gl_fragment_program *Current; /**< User-bound fragment program */ - /** Currently enabled and valid program (including internal programs) */ + /** Currently enabled and valid program (including internal programs + * and compiled shader programs). + */ struct gl_fragment_program *_Current; GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */ @@ -2099,9 +2103,7 @@ struct gl_shader_program */ struct gl_shader_state { - GLboolean _VertexShaderPresent; - GLboolean _FragmentShaderPresent; - struct gl_shader_program *CurrentProgram; + struct gl_shader_program *CurrentProgram; /**< The user-bound program */ }; diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index c439f71f41..70ceb70fe7 100644 --- a/src/mesa/shader/shader_api.c +++ b/src/mesa/shader/shader_api.c @@ -199,8 +199,7 @@ _mesa_lookup_shader(GLcontext *ctx, GLuint name) void _mesa_init_shader_state(GLcontext * ctx) { - ctx->Shader._FragmentShaderPresent = GL_FALSE; - ctx->Shader._VertexShaderPresent = GL_FALSE; + /* no-op */ } diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 5e174f81d5..031d74f31b 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -102,10 +102,6 @@ _swrast_update_rasterflags( GLcontext *ctx ) rasterMask |= FRAGPROG_BIT; } - if (ctx->Shader._FragmentShaderPresent) { - rasterMask |= FRAGPROG_BIT; - } - if (ctx->ATIFragmentShader._Enabled) { rasterMask |= ATIFRAGSHADER_BIT; } |