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/drivers/dri | |
| 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/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index c95fb3739b3..ba98cd42a5e 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1443,7 +1443,7 @@ brw_upload_wm_ubo_surfaces(struct brw_context *brw) { struct gl_context *ctx = &brw->ctx; /* _NEW_PROGRAM */ - struct gl_program *prog = ctx->_Shader->_CurrentFragmentProgram; + struct gl_program *prog = ctx->FragmentProgram._Current; /* BRW_NEW_FS_PROG_DATA */ brw_upload_ubo_surfaces(brw, prog, &brw->wm.base, brw->wm.base.prog_data); |