diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-08-27 11:10:35 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2015-05-02 00:50:00 -0700 |
| commit | eeee212e53feac673ea4ac0345fe493418b187df (patch) | |
| tree | 609c3526db9f34584cfe2f25c3645b8f7bd9065a /src/mesa/drivers | |
| parent | 5328ffbe799bf40a971ebe804404ade91abddd33 (diff) | |
| download | external_mesa3d-eeee212e53feac673ea4ac0345fe493418b187df.zip external_mesa3d-eeee212e53feac673ea4ac0345fe493418b187df.tar.gz external_mesa3d-eeee212e53feac673ea4ac0345fe493418b187df.tar.bz2 | |
i965: Upload atomic buffer state for compute shaders
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 25 |
4 files changed, 29 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 542ec3d..2fcdcfa 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1447,7 +1447,7 @@ struct brw_context int num_atoms[BRW_NUM_PIPELINES]; const struct brw_tracked_state render_atoms[57]; - const struct brw_tracked_state compute_atoms[2]; + const struct brw_tracked_state compute_atoms[3]; /* If (INTEL_DEBUG & DEBUG_BATCH) */ struct { diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index 5c27b3d..adfbd22 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -84,6 +84,7 @@ extern const struct brw_tracked_state brw_gs_binding_table; extern const struct brw_tracked_state brw_vs_binding_table; extern const struct brw_tracked_state brw_wm_ubo_surfaces; extern const struct brw_tracked_state brw_wm_abo_surfaces; +extern const struct brw_tracked_state brw_cs_abo_surfaces; extern const struct brw_tracked_state brw_wm_unit; extern const struct brw_tracked_state brw_interpolation_map; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 686a3da..84b0861 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -250,6 +250,7 @@ static const struct brw_tracked_state *gen7_render_atoms[] = static const struct brw_tracked_state *gen7_compute_atoms[] = { &brw_state_base_address, + &brw_cs_abo_surfaces, &brw_cs_state, }; @@ -332,6 +333,7 @@ static const struct brw_tracked_state *gen8_render_atoms[] = static const struct brw_tracked_state *gen8_compute_atoms[] = { &gen8_state_base_address, + &brw_cs_abo_surfaces, &brw_cs_state, }; 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 25fb543..160dd2f 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -997,6 +997,31 @@ const struct brw_tracked_state brw_wm_abo_surfaces = { .emit = brw_upload_wm_abo_surfaces, }; +static void +brw_upload_cs_abo_surfaces(struct brw_context *brw) +{ + struct gl_context *ctx = &brw->ctx; + /* _NEW_PROGRAM */ + struct gl_shader_program *prog = + ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE]; + + if (prog) { + /* BRW_NEW_CS_PROG_DATA */ + brw_upload_abo_surfaces(brw, prog, &brw->cs.base, + &brw->cs.prog_data->base); + } +} + +const struct brw_tracked_state brw_cs_abo_surfaces = { + .dirty = { + .mesa = _NEW_PROGRAM, + .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BATCH | + BRW_NEW_CS_PROG_DATA, + }, + .emit = brw_upload_cs_abo_surfaces, +}; + void gen4_init_vtable_surface_functions(struct brw_context *brw) { |