From 1e86eaf7d83e73b0287722a868718eb18675ce08 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 17 May 2018 09:56:47 +0200 Subject: [PATCH] radv: remove radv_device::llvm_supports_spill It's always true. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_device.c | 2 -- src/amd/vulkan/radv_private.h | 1 - src/amd/vulkan/radv_shader.c | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a7f4a5ab7b8..2ce0c9dbd0f 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1454,8 +1454,6 @@ VkResult radv_CreateDevice( device->always_use_syncobj = device->physical_device->rad_info.has_syncobj_wait_for_submit; #endif - device->llvm_supports_spill = true; - /* The maximum number of scratch waves. Scratch space isn't divided * evenly between CUs. The number is only a function of the number of CUs. * We can decrease the constant to decrease the scratch buffer size. diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index e3eed887fae..304ed17f01a 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -624,7 +624,6 @@ struct radv_device { struct radeon_winsys_cs *empty_cs[RADV_MAX_QUEUE_FAMILIES]; bool always_use_syncobj; - bool llvm_supports_spill; bool has_distributed_tess; bool pbb_allowed; bool dfsm_allowed; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index dfe63d60d4c..1968758a391 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -376,9 +376,6 @@ radv_fill_shader_variant(struct radv_device *device, struct radv_shader_info *info = &variant->info.info; unsigned vgpr_comp_cnt = 0; - if (scratch_enabled && !device->llvm_supports_spill) - radv_finishme("shader scratch support only available with LLVM 4.0"); - variant->code_size = binary->code_size; variant->rsrc2 = S_00B12C_USER_SGPR(variant->info.num_user_sgprs) | S_00B12C_SCRATCH_EN(scratch_enabled); @@ -554,7 +551,7 @@ radv_shader_variant_create(struct radv_device *device, options.key = *key; options.unsafe_math = !!(device->instance->debug_flags & RADV_DEBUG_UNSAFE_MATH); - options.supports_spill = device->llvm_supports_spill; + options.supports_spill = true; return shader_variant_create(device, module, shaders, shader_count, shaders[shader_count - 1]->info.stage, &options, false, code_out, code_size_out); -- 2.30.2