diff options
| author | Caio Oliveira <caio.oliveira@intel.com> | 2021-12-20 15:19:35 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-12-21 18:25:05 +0000 |
| commit | ac90519e3526a2947f7124502ff2c49ebabab1de (patch) | |
| tree | bd699082dc4f1208111016b6faca43fb9428c6c4 | |
| parent | d36a43598c2dd2c490e8e8cb901d067fa56aeb8d (diff) | |
anv: Simplify assertions related to graphics stages
In all three cases, COMPUTE was on the table but with an invalid
value (zero). Drop it from the tables and the extra assertion, so if
a COMPUTE is passed it will just fail the ARRAY_SIZE assertion.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14274>
| -rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 371fca734da..8c40ba19b50 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3001,7 +3001,6 @@ cmd_buffer_emit_descriptor_pointers(struct anv_cmd_buffer *cmd_buffer, [MESA_SHADER_TESS_EVAL] = 45, /* DS */ [MESA_SHADER_GEOMETRY] = 46, [MESA_SHADER_FRAGMENT] = 47, - [MESA_SHADER_COMPUTE] = 0, }; static const uint32_t binding_table_opcodes[] = { @@ -3010,12 +3009,10 @@ cmd_buffer_emit_descriptor_pointers(struct anv_cmd_buffer *cmd_buffer, [MESA_SHADER_TESS_EVAL] = 40, [MESA_SHADER_GEOMETRY] = 41, [MESA_SHADER_FRAGMENT] = 42, - [MESA_SHADER_COMPUTE] = 0, }; anv_foreach_stage(s, stages) { assert(s < ARRAY_SIZE(binding_table_opcodes)); - assert(binding_table_opcodes[s] > 0); if (cmd_buffer->state.samplers[s].alloc_size > 0) { anv_batch_emit(&cmd_buffer->batch, @@ -3190,11 +3187,9 @@ cmd_buffer_emit_push_constant(struct anv_cmd_buffer *cmd_buffer, [MESA_SHADER_TESS_EVAL] = 26, /* DS */ [MESA_SHADER_GEOMETRY] = 22, [MESA_SHADER_FRAGMENT] = 23, - [MESA_SHADER_COMPUTE] = 0, }; assert(stage < ARRAY_SIZE(push_constant_opcodes)); - assert(push_constant_opcodes[stage] > 0); UNUSED uint32_t mocs = anv_mocs(cmd_buffer->device, NULL, 0); @@ -3301,12 +3296,10 @@ cmd_buffer_emit_push_constant_all(struct anv_cmd_buffer *cmd_buffer, [MESA_SHADER_TESS_EVAL] = 26, /* DS */ [MESA_SHADER_GEOMETRY] = 22, [MESA_SHADER_FRAGMENT] = 23, - [MESA_SHADER_COMPUTE] = 0, }; gl_shader_stage stage = vk_to_mesa_shader_stage(shader_mask); assert(stage < ARRAY_SIZE(push_constant_opcodes)); - assert(push_constant_opcodes[stage] > 0); const struct anv_pipeline_bind_map *bind_map = &pipeline->shaders[stage]->bind_map; |