diff options
| author | Paul Berry <[email protected]> | 2013-08-25 09:28:08 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-08-31 17:10:54 -0700 |
| commit | cdf03b69282d12f9d27daf2edb3abb351f5de7f6 (patch) | |
| tree | 55cd2056059594af0937ffa9aa7411986b69b26e /src/mesa/drivers/dri/i965/brw_vs_surface_state.c | |
| parent | b3a4d5c78544ee957c4880cec7eb67f00ae04afd (diff) | |
i965/gs: Update defines related to GS surface organization.
Defines that previously referred to VS now refer to VEC4, since they
will be shared by the user-programmable vertex shader and geometry
shader stages.
Defines that previously referred to the Gen6 geometry shader stage
(which is only used for transform feedback) are now renamed to
explicitly refer to Gen6, to avoid confusion with the Gen7
user-programmable geometry shader stage.
Based on work by Eric Anholt <[email protected]>.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vs_surface_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index 4577e769122..fe2459f09e5 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -59,7 +59,7 @@ brw_upload_vs_pull_constants(struct brw_context *brw) if (brw->vs.const_bo) { drm_intel_bo_unreference(brw->vs.const_bo); brw->vs.const_bo = NULL; - brw->vs.surf_offset[SURF_INDEX_VERT_CONST_BUFFER] = 0; + brw->vs.surf_offset[SURF_INDEX_VEC4_CONST_BUFFER] = 0; brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF; } return; @@ -89,7 +89,7 @@ brw_upload_vs_pull_constants(struct brw_context *brw) drm_intel_gem_bo_unmap_gtt(brw->vs.const_bo); - const int surf = SURF_INDEX_VERT_CONST_BUFFER; + const int surf = SURF_INDEX_VEC4_CONST_BUFFER; brw->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0, size, &brw->vs.surf_offset[surf], false); @@ -116,7 +116,7 @@ brw_upload_vs_ubo_surfaces(struct brw_context *brw) return; brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX], - &brw->vs.surf_offset[SURF_INDEX_VS_UBO(0)]); + &brw->vs.surf_offset[SURF_INDEX_VEC4_UBO(0)]); } const struct brw_tracked_state brw_vs_ubo_surfaces = { @@ -139,7 +139,7 @@ brw_vs_upload_binding_table(struct brw_context *brw) int i; if (INTEL_DEBUG & DEBUG_SHADER_TIME) { - gen7_create_shader_time_surface(brw, &brw->vs.surf_offset[SURF_INDEX_VS_SHADER_TIME]); + gen7_create_shader_time_surface(brw, &brw->vs.surf_offset[SURF_INDEX_VEC4_SHADER_TIME]); } /* CACHE_NEW_VS_PROG: Skip making a binding table if we don't use textures or |