diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-13 03:35:37 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-13 20:02:06 +0000 |
| commit | 604e562e5b2b7e01e5c9d031a7a2401cfe0edf62 (patch) | |
| tree | 9e23c3d1769883dc8714f80df0567ffe2d6e2335 | |
| parent | 8b47b97215af7157bc15676167cab73aa5a61a76 (diff) | |
radv: don't pass physical device to si_init_ fns.
This is just a trivial cleanup.
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 4 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/si_cmd_buffer.c | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 25b1bd6a3e8..93bcd0a9218 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1626,7 +1626,7 @@ VkResult radv_BeginCommandBuffer( RADV_CMD_FLAG_INV_SMEM_L1 | RADV_CMD_FLUSH_AND_INV_FRAMEBUFFER | RADV_CMD_FLAG_INV_GLOBAL_L2; - si_init_config(cmd_buffer->device->physical_device, cmd_buffer); + si_init_config(cmd_buffer); radv_set_db_count_control(cmd_buffer); si_emit_cache_flush(cmd_buffer); break; @@ -1636,7 +1636,7 @@ VkResult radv_BeginCommandBuffer( RADV_CMD_FLAG_INV_VMEM_L1 | RADV_CMD_FLAG_INV_SMEM_L1 | RADV_CMD_FLAG_INV_GLOBAL_L2; - si_init_compute(cmd_buffer->device->physical_device, cmd_buffer); + si_init_compute(cmd_buffer); si_emit_cache_flush(cmd_buffer); break; case RADV_QUEUE_TRANSFER: diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 9a88ce0d64d..6710f8a1be8 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -758,10 +758,8 @@ struct radv_image; bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer); -void si_init_compute(struct radv_physical_device *physical_device, - struct radv_cmd_buffer *cmd_buffer); -void si_init_config(struct radv_physical_device *physical_device, - struct radv_cmd_buffer *cmd_buffer); +void si_init_compute(struct radv_cmd_buffer *cmd_buffer); +void si_init_config(struct radv_cmd_buffer *cmd_buffer); void si_write_viewport(struct radeon_winsys_cs *cs, int first_vp, int count, const VkViewport *viewports); void si_write_scissors(struct radeon_winsys_cs *cs, int first, diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index b94c1f10797..79a2455f921 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -171,9 +171,9 @@ si_write_harvested_raster_configs(struct radv_physical_device *physical_device, } void -si_init_compute(struct radv_physical_device *physical_device, - struct radv_cmd_buffer *cmd_buffer) +si_init_compute(struct radv_cmd_buffer *cmd_buffer) { + struct radv_physical_device *physical_device = cmd_buffer->device->physical_device; struct radeon_winsys_cs *cs = cmd_buffer->cs; radeon_set_sh_reg_seq(cs, R_00B810_COMPUTE_START_X, 3); radeon_emit(cs, 0); @@ -211,9 +211,9 @@ si_init_compute(struct radv_physical_device *physical_device, } -void si_init_config(struct radv_physical_device *physical_device, - struct radv_cmd_buffer *cmd_buffer) +void si_init_config(struct radv_cmd_buffer *cmd_buffer) { + struct radv_physical_device *physical_device = cmd_buffer->device->physical_device; unsigned num_rb = MIN2(physical_device->rad_info.num_render_backends, 16); unsigned rb_mask = physical_device->rad_info.enabled_rb_mask; unsigned raster_config, raster_config_1; @@ -420,7 +420,7 @@ void si_init_config(struct radv_physical_device *physical_device, if (physical_device->rad_info.family == CHIP_STONEY) radeon_set_context_reg(cs, R_028C40_PA_SC_SHADER_CONTROL, 0); - si_init_compute(physical_device, cmd_buffer); + si_init_compute(cmd_buffer); } static void |