diff options
author | Dave Airlie <[email protected]> | 2017-04-19 14:25:19 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2017-05-08 08:56:55 +1000 |
commit | bcf705b62e00c45a178e07ef01e7d266f73c2acc (patch) | |
tree | 1ef8302b68368a29ca26df56719a5c5669518b1a /src/amd/vulkan | |
parent | 387fdf84c5c21d859e9ac18a9af4ba7e3b0e35db (diff) |
radv/meta: cleanup some unused code path
After moving everything to using push constants,
these paths are no longer needed.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
-rw-r--r-- | src/amd/vulkan/radv_meta.c | 25 | ||||
-rw-r--r-- | src/amd/vulkan/radv_meta.h | 10 |
2 files changed, 1 insertions, 34 deletions
diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 5899e77e0f9..fb83576fe64 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -30,7 +30,7 @@ #include <pwd.h> #include <sys/stat.h> -void +static void radv_meta_save_novertex(struct radv_meta_saved_state *state, const struct radv_cmd_buffer *cmd_buffer, uint32_t dynamic_mask) @@ -46,18 +46,6 @@ radv_meta_save_novertex(struct radv_meta_saved_state *state, } void -radv_meta_save(struct radv_meta_saved_state *state, - const struct radv_cmd_buffer *cmd_buffer, - uint32_t dynamic_mask) -{ - radv_meta_save_novertex(state, cmd_buffer, dynamic_mask); - state->old_descriptor_set0 = cmd_buffer->state.descriptors[0]; - memcpy(state->old_vertex_bindings, cmd_buffer->state.vertex_bindings, - sizeof(state->old_vertex_bindings)); - state->vertex_saved = true; -} - -void radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buffer *cmd_buffer) { @@ -406,17 +394,6 @@ radv_device_finish_meta(struct radv_device *device) * should have no effect. */ void -radv_meta_save_graphics_reset_vport_scissor(struct radv_meta_saved_state *saved_state, - struct radv_cmd_buffer *cmd_buffer) -{ - uint32_t dirty_state = (1 << VK_DYNAMIC_STATE_VIEWPORT) | (1 << VK_DYNAMIC_STATE_SCISSOR); - radv_meta_save(saved_state, cmd_buffer, dirty_state); - cmd_buffer->state.dynamic.viewport.count = 0; - cmd_buffer->state.dynamic.scissor.count = 0; - cmd_buffer->state.dirty |= dirty_state; -} - -void radv_meta_save_graphics_reset_vport_scissor_novertex(struct radv_meta_saved_state *saved_state, struct radv_cmd_buffer *cmd_buffer) { diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h index 3efa76d0a34..c4a81a25945 100644 --- a/src/amd/vulkan/radv_meta.h +++ b/src/amd/vulkan/radv_meta.h @@ -95,14 +95,6 @@ void radv_device_finish_meta_resolve_compute_state(struct radv_device *device); VkResult radv_device_init_meta_resolve_fragment_state(struct radv_device *device); void radv_device_finish_meta_resolve_fragment_state(struct radv_device *device); -void radv_meta_save(struct radv_meta_saved_state *state, - const struct radv_cmd_buffer *cmd_buffer, - uint32_t dynamic_mask); - -void radv_meta_save_novertex(struct radv_meta_saved_state *state, - const struct radv_cmd_buffer *cmd_buffer, - uint32_t dynamic_mask); - void radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buffer *cmd_buffer); @@ -209,8 +201,6 @@ void radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, const VkImageSubresourceRange *subresourceRange); -void radv_meta_save_graphics_reset_vport_scissor(struct radv_meta_saved_state *saved_state, - struct radv_cmd_buffer *cmd_buffer); void radv_meta_save_graphics_reset_vport_scissor_novertex(struct radv_meta_saved_state *saved_state, struct radv_cmd_buffer *cmd_buffer); |