diff options
author | Jason Ekstrand <[email protected]> | 2016-10-17 10:13:07 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2016-10-17 17:41:35 -0700 |
commit | 52904ba85c7e1e3092601e3497bfbc246b00b84a (patch) | |
tree | c6b5f287ba5bef9082a66532502902f1ff30f901 | |
parent | 7998e37774c9589b456d9a951d47db98c16d6202 (diff) |
anv: Get rid of anv_cmd_buffer_emit_state_base_address
All code that would have once called this can now call the gen-specific
version. The switching version is no longer needed.
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
-rw-r--r-- | src/intel/vulkan/anv_cmd_buffer.c | 18 | ||||
-rw-r--r-- | src/intel/vulkan/anv_private.h | 2 | ||||
-rw-r--r-- | src/intel/vulkan/genX_blorp_exec.c | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 26a2be6090e..72f4f28172b 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -348,24 +348,6 @@ VkResult anv_ResetCommandBuffer( return anv_cmd_buffer_reset(cmd_buffer); } -void -anv_cmd_buffer_emit_state_base_address(struct anv_cmd_buffer *cmd_buffer) -{ - switch (cmd_buffer->device->info.gen) { - case 7: - if (cmd_buffer->device->info.is_haswell) - return gen75_cmd_buffer_emit_state_base_address(cmd_buffer); - else - return gen7_cmd_buffer_emit_state_base_address(cmd_buffer); - case 8: - return gen8_cmd_buffer_emit_state_base_address(cmd_buffer); - case 9: - return gen9_cmd_buffer_emit_state_base_address(cmd_buffer); - default: - unreachable("unsupported gen\n"); - } -} - void anv_CmdBindPipeline( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 49b33986a80..a4a1dd0ddc4 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1319,8 +1319,6 @@ void gen8_cmd_buffer_emit_depth_viewport(struct anv_cmd_buffer *cmd_buffer, bool depth_clamp_enable); void gen7_cmd_buffer_emit_scissor(struct anv_cmd_buffer *cmd_buffer); -void anv_cmd_buffer_emit_state_base_address(struct anv_cmd_buffer *cmd_buffer); - void anv_cmd_state_setup_attachments(struct anv_cmd_buffer *cmd_buffer, const VkRenderPassBeginInfo *info); diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c index d43de913f7f..185aff6b589 100644 --- a/src/intel/vulkan/genX_blorp_exec.c +++ b/src/intel/vulkan/genX_blorp_exec.c @@ -97,7 +97,7 @@ blorp_alloc_binding_table(struct blorp_batch *batch, unsigned num_entries, /* Re-emit state base addresses so we get the new surface state base * address before we start emitting binding tables etc. */ - anv_cmd_buffer_emit_state_base_address(cmd_buffer); + genX(cmd_buffer_emit_state_base_address)(cmd_buffer); bt_state = anv_cmd_buffer_alloc_binding_table(cmd_buffer, num_entries, &state_offset); |