From bf787fd91b31ccf55c2430905e5932485b7fa7cb Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 15 May 2026 18:40:17 +0200 Subject: [PATCH] radv: rename few drirc options for consistency So that the option name matches everywhere. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_image.c | 2 +- src/amd/vulkan/radv_instance.c | 8 ++++---- src/amd/vulkan/radv_instance.h | 8 ++++---- src/amd/vulkan/radv_physical_device.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index c2765a124a4..5f3ed0322c2 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1610,7 +1610,7 @@ radv_layout_is_htile_compressed(const struct radv_device *device, const struct r * the number of decompressions from/to GENERAL. */ if (radv_tc_compat_htile_enabled(image, level) && queue_mask & (1u << RADV_QUEUE_GENERAL) && - !instance->drirc.debug.disable_tc_compat_htile_in_general) { + !instance->drirc.debug.disable_tc_compat_htile_general) { return true; } else { return false; diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 8eadd39cd0b..17ed307aea1 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -250,7 +250,7 @@ radv_init_dri_debug_options(struct radv_instance *instance) drirc->debug.disable_dcc_stores = driQueryOptionb(&drirc->options, "radv_disable_dcc_stores"); drirc->debug.disable_shrink_image_store = driQueryOptionb(&drirc->options, "radv_disable_shrink_image_store"); drirc->debug.disable_sinking_load_input_fs = driQueryOptionb(&drirc->options, "radv_disable_sinking_load_input_fs"); - drirc->debug.disable_tc_compat_htile_in_general = + drirc->debug.disable_tc_compat_htile_general = driQueryOptionb(&drirc->options, "radv_disable_tc_compat_htile_general"); drirc->debug.disable_trunc_coord = driQueryOptionb(&drirc->options, "radv_disable_trunc_coord"); @@ -305,9 +305,9 @@ radv_init_dri_features_options(struct radv_instance *instance) drirc->features.cooperative_matrix2_nv = driQueryOptionb(&drirc->options, "radv_cooperative_matrix2_nv"); drirc->features.emulate_rt = driQueryOptionb(&drirc->options, "radv_emulate_rt"); - drirc->features.expose_float16_gfx8 = driQueryOptionb(&drirc->options, "radv_enable_float16_gfx8"); - drirc->features.vk_require_etc2 = driQueryOptionb(&drirc->options, "vk_require_etc2"); - drirc->features.vk_require_astc = driQueryOptionb(&drirc->options, "vk_require_astc"); + drirc->features.enable_float16_gfx8 = driQueryOptionb(&drirc->options, "radv_enable_float16_gfx8"); + drirc->features.require_etc2 = driQueryOptionb(&drirc->options, "vk_require_etc2"); + drirc->features.require_astc = driQueryOptionb(&drirc->options, "vk_require_astc"); } static void diff --git a/src/amd/vulkan/radv_instance.h b/src/amd/vulkan/radv_instance.h index e9c4a9f32c1..54e90bc080c 100644 --- a/src/amd/vulkan/radv_instance.h +++ b/src/amd/vulkan/radv_instance.h @@ -45,7 +45,7 @@ struct radv_drirc { bool disable_dcc_stores; bool disable_shrink_image_store; bool disable_sinking_load_input_fs; - bool disable_tc_compat_htile_in_general; + bool disable_tc_compat_htile_general; bool disable_trunc_coord; bool enable_mrt_output_nan_fixup; bool flush_before_query_copy; @@ -77,9 +77,9 @@ struct radv_drirc { struct { bool cooperative_matrix2_nv; bool emulate_rt; - bool expose_float16_gfx8; - bool vk_require_astc; - bool vk_require_etc2; + bool enable_float16_gfx8; + bool require_astc; + bool require_etc2; } features; struct { diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 3281d204d85..0b48f66c43f 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -218,7 +218,7 @@ radv_shader_fp16_enabled(const struct radv_physical_device *pdev) * that by default because it can sometimes hurt perf. */ return pdev->info.compiler_info.has_packed_math_16bit || - (pdev->info.gfx_level == GFX8 && instance->drirc.features.expose_float16_gfx8); + (pdev->info.gfx_level == GFX8 && instance->drirc.features.enable_float16_gfx8); } bool @@ -2577,8 +2577,8 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm pdev->emulate_etc2 = !pdev->info.has_etc_support; pdev->emulate_astc = true; #else - pdev->emulate_etc2 = !pdev->info.has_etc_support && instance->drirc.features.vk_require_etc2; - pdev->emulate_astc = instance->drirc.features.vk_require_astc; + pdev->emulate_etc2 = !pdev->info.has_etc_support && instance->drirc.features.require_etc2; + pdev->emulate_astc = instance->drirc.features.require_astc; #endif const char *name = ac_get_family_name(pdev->info.family);