diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-05-10 11:17:27 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-05-14 13:34:10 -0700 |
| commit | b0f8768905c84b3aa69a44030d998d1076d77728 (patch) | |
| tree | 9294e5cdf785074e86d523da8bdced6089438353 /src/mesa/drivers/dri/i965/brw_state.h | |
| parent | 712a980adde0b14eee8b4accd02af9b9740091a2 (diff) | |
| download | external_mesa3d-b0f8768905c84b3aa69a44030d998d1076d77728.zip external_mesa3d-b0f8768905c84b3aa69a44030d998d1076d77728.tar.gz external_mesa3d-b0f8768905c84b3aa69a44030d998d1076d77728.tar.bz2 | |
i965/state: Clean up WM/PS state to pull more things out of prog_data
Now that we have a persample_shading bit in prog_data we can reduce the
amount the state setup code needs to be looking at the GL state. In
particular, it no longer pulls anything directly out of the
gl_fragment_program and no longer depends on NEW_FRAGMENT_PROGRAM.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index 5c971d1..6efcef1 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -305,15 +305,12 @@ void gen7_init_vtable_surface_functions(struct brw_context *brw); /* gen8_ps_state.c */ void gen8_upload_ps_state(struct brw_context *brw, - const struct gl_fragment_program *fp, const struct brw_stage_state *stage_state, const struct brw_wm_prog_data *prog_data, uint32_t fast_clear_op); void gen8_upload_ps_extra(struct brw_context *brw, - const struct gl_fragment_program *fp, - const struct brw_wm_prog_data *prog_data, - bool multisampled_fbo); + const struct brw_wm_prog_data *prog_data); /* gen7_sol_state.c */ void gen7_upload_3dstate_so_decl_list(struct brw_context *brw, @@ -370,10 +367,9 @@ void brw_update_sampler_state(struct brw_context *brw, /* gen6_wm_state.c */ void gen6_upload_wm_state(struct brw_context *brw, - const struct brw_fragment_program *fp, const struct brw_wm_prog_data *prog_data, const struct brw_stage_state *stage_state, - bool multisampled_fbo, int min_inv_per_frag, + bool multisampled_fbo, bool dual_source_blend_enable, bool kill_enable, bool color_buffer_write_enable, bool msaa_enabled, bool line_stipple_enable, bool polygon_stipple_enable, |