diff options
| author | Timothy Arceri <[email protected]> | 2017-05-10 10:37:35 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-11 14:46:39 +1000 |
| commit | 6d7660cf4b7c0c73b4394f09dd149c6b0386115c (patch) | |
| tree | faf00a30c3b34944ebd954b374a21beeae54b5a6 /src/mesa/main/state.c | |
| parent | 276166c45b5733137f2e562bd0aca84c8652124b (diff) | |
mesa: remove _CurrentFragmentProgram from gl_pipeline_object
This was added in b527dd65c830a as a work around because fixed function
fragment shaders were tracked in ctx->FragmentProgram._Current as
a gl_program rather than gl_shader_program.
However after my refactoring of the program and shader structs
at the end of 2016 which culminated in c505d6d85222, we no longer
need gl_shader_program to track the current program making
_CurrentFragmentProgram obsolete.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 5a760f5e5d0..73872b822a6 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -133,16 +133,12 @@ update_program(struct gl_context *ctx) if (fsProg) { /* Use GLSL fragment shader */ - _mesa_reference_program(ctx, &ctx->_Shader->_CurrentFragmentProgram, - fsProg); _mesa_reference_program(ctx, &ctx->FragmentProgram._Current, fsProg); _mesa_reference_program(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL); } else if (ctx->FragmentProgram._Enabled) { /* Use user-defined fragment program */ - _mesa_reference_program(ctx, &ctx->_Shader->_CurrentFragmentProgram, - NULL); _mesa_reference_program(ctx, &ctx->FragmentProgram._Current, ctx->FragmentProgram.Current); _mesa_reference_program(ctx, &ctx->FragmentProgram._TexEnvProgram, @@ -151,8 +147,6 @@ update_program(struct gl_context *ctx) else if (ctx->ATIFragmentShader._Enabled && ctx->ATIFragmentShader.Current->Program) { /* Use the enabled ATI fragment shader's associated program */ - _mesa_reference_program(ctx, &ctx->_Shader->_CurrentFragmentProgram, - NULL); _mesa_reference_program(ctx, &ctx->FragmentProgram._Current, ctx->ATIFragmentShader.Current->Program); _mesa_reference_program(ctx, &ctx->FragmentProgram._TexEnvProgram, @@ -162,8 +156,6 @@ update_program(struct gl_context *ctx) /* Use fragment program generated from fixed-function state */ struct gl_shader_program *f = _mesa_get_fixed_func_fragment_program(ctx); - _mesa_reference_program(ctx, &ctx->_Shader->_CurrentFragmentProgram, - f->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program); _mesa_reference_program(ctx, &ctx->FragmentProgram._Current, f->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program); _mesa_reference_program(ctx, &ctx->FragmentProgram._TexEnvProgram, |