diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-08-25 09:28:08 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-08-31 17:10:54 -0700 |
| commit | cdf03b69282d12f9d27daf2edb3abb351f5de7f6 (patch) | |
| tree | 55cd2056059594af0937ffa9aa7411986b69b26e /src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | |
| parent | b3a4d5c78544ee957c4880cec7eb67f00ae04afd (diff) | |
| download | external_mesa3d-cdf03b69282d12f9d27daf2edb3abb351f5de7f6.zip external_mesa3d-cdf03b69282d12f9d27daf2edb3abb351f5de7f6.tar.gz external_mesa3d-cdf03b69282d12f9d27daf2edb3abb351f5de7f6.tar.bz2 | |
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 <eric@anholt.net>.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4_emit.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 1f00260..bf04bd9 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -155,7 +155,7 @@ vec4_generator::~vec4_generator() void vec4_generator::mark_surface_used(unsigned surf_index) { - assert(surf_index < BRW_MAX_VS_SURFACES); + assert(surf_index < BRW_MAX_VEC4_SURFACES); prog_data->binding_table_size = MAX2(prog_data->binding_table_size, surf_index + 1); @@ -386,7 +386,7 @@ vec4_generator::generate_tex(vec4_instruction *inst, dst, inst->base_mrf, src, - SURF_INDEX_VS_TEXTURE(inst->sampler), + SURF_INDEX_VEC4_TEXTURE(inst->sampler), inst->sampler, msg_type, 1, /* response length */ @@ -395,7 +395,7 @@ vec4_generator::generate_tex(vec4_instruction *inst, BRW_SAMPLER_SIMD_MODE_SIMD4X2, return_format); - mark_surface_used(SURF_INDEX_VS_TEXTURE(inst->sampler)); + mark_surface_used(SURF_INDEX_VEC4_TEXTURE(inst->sampler)); } void @@ -1004,8 +1004,8 @@ vec4_generator::generate_vec4_instruction(vec4_instruction *instruction, break; case SHADER_OPCODE_SHADER_TIME_ADD: - brw_shader_time_add(p, src[0], SURF_INDEX_VS_SHADER_TIME); - mark_surface_used(SURF_INDEX_VS_SHADER_TIME); + brw_shader_time_add(p, src[0], SURF_INDEX_VEC4_SHADER_TIME); + mark_surface_used(SURF_INDEX_VEC4_SHADER_TIME); break; case VS_OPCODE_UNPACK_FLAGS_SIMD4X2: |