diff options
author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2021-04-13 03:10:49 +0200 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-04-14 15:16:17 +0000 |
commit | 057ec395a419d6d661664a3a8735bd5044026d98 (patch) | |
tree | 063bbcb72fe59f4f5ea289a2bfd141f0c8f27bfb /src/amd/vulkan/radv_cmd_buffer.c | |
parent | 9de05fd36bc7efcda35f6fc107a58b837bc0403b (diff) |
radv: Refactor cs_domain to be a winsys function.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10198>
Diffstat (limited to 'src/amd/vulkan/radv_cmd_buffer.c')
-rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index a463e5cc18a..5e98bd2bc36 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -461,15 +461,6 @@ radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer) return cmd_buffer->record_result; } -enum radeon_bo_domain -radv_cmdbuffer_domain(const struct radeon_info *info, uint32_t perftest) -{ - bool use_sam = - (info->all_vram_visible && info->has_dedicated_vram && !(perftest & RADV_PERFTEST_NO_SAM)) || - (perftest & RADV_PERFTEST_SAM); - return use_sam ? RADEON_DOMAIN_VRAM : RADEON_DOMAIN_GTT; -} - static bool radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer *cmd_buffer, uint64_t min_needed) { @@ -481,12 +472,10 @@ radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer *cmd_buffer, uint64_t m new_size = MAX2(min_needed, 16 * 1024); new_size = MAX2(new_size, 2 * cmd_buffer->upload.size); - bo = device->ws->buffer_create( - device->ws, new_size, 4096, - radv_cmdbuffer_domain(&device->physical_device->rad_info, device->instance->perftest_flags), - RADEON_FLAG_CPU_ACCESS | RADEON_FLAG_NO_INTERPROCESS_SHARING | RADEON_FLAG_32BIT | - RADEON_FLAG_GTT_WC, - RADV_BO_PRIORITY_UPLOAD_BUFFER); + bo = device->ws->buffer_create(device->ws, new_size, 4096, device->ws->cs_domain(device->ws), + RADEON_FLAG_CPU_ACCESS | RADEON_FLAG_NO_INTERPROCESS_SHARING | + RADEON_FLAG_32BIT | RADEON_FLAG_GTT_WC, + RADV_BO_PRIORITY_UPLOAD_BUFFER); if (!bo) { cmd_buffer->record_result = VK_ERROR_OUT_OF_DEVICE_MEMORY; |