From bbade676f45bbffef16f05b02adbb2f12bd3948f Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 27 Feb 2025 11:07:19 +0200 Subject: [PATCH] anv/iris: centralize TBIMR drirc Signed-off-by: Lionel Landwerlin Reviewed-by: Caio Oliveira Part-of: --- src/gallium/drivers/iris/driinfo_iris.h | 2 +- src/intel/vulkan/anv_instance.c | 2 +- src/util/driconf.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/driinfo_iris.h b/src/gallium/drivers/iris/driinfo_iris.h index 295c273d574..29d126c09b5 100644 --- a/src/gallium/drivers/iris/driinfo_iris.h +++ b/src/gallium/drivers/iris/driinfo_iris.h @@ -12,8 +12,8 @@ DRI_CONF_SECTION_END DRI_CONF_SECTION_PERFORMANCE DRI_CONF_ADAPTIVE_SYNC(true) + DRI_CONFIG_INTEL_TBIMR(true) DRI_CONF_OPT_E(bo_reuse, 1, 0, 1, "Buffer object reuse",) - DRI_CONF_OPT_B(intel_tbimr, true, "Enable TBIMR tiled rendering") DRI_CONF_OPT_I(generated_indirect_threshold, 100, 0, INT32_MAX, "Generated indirect draw threshold") DRI_CONF_SECTION_END diff --git a/src/intel/vulkan/anv_instance.c b/src/intel/vulkan/anv_instance.c index 0e1b615538d..791b2aa9977 100644 --- a/src/intel/vulkan/anv_instance.c +++ b/src/intel/vulkan/anv_instance.c @@ -32,7 +32,7 @@ static const driOptionDescription anv_dri_options[] = { DRI_CONF_ANV_QUERY_COPY_WITH_SHADER_THRESHOLD(6) DRI_CONF_ANV_FORCE_INDIRECT_DESCRIPTORS(false) DRI_CONF_SHADER_SPILLING_RATE(11) - DRI_CONF_OPT_B(intel_tbimr, true, "Enable TBIMR tiled rendering") + DRI_CONFIG_INTEL_TBIMR(true) DRI_CONF_ANV_COMPRESSION_CONTROL_ENABLED(false) DRI_CONF_ANV_FAKE_NONLOCAL_MEMORY(false) DRI_CONF_OPT_E(intel_stack_id, 512, 256, 2048, diff --git a/src/util/driconf.h b/src/util/driconf.h index 8ec236f4483..693b01dab7a 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -327,6 +327,9 @@ DRI_CONF_OPT_B(fake_sparse, def, \ "Advertise support for sparse binding of textures regardless of real support") +#define DRI_CONFIG_INTEL_TBIMR(def) \ + DRI_CONF_OPT_B(intel_tbimr, def, "Enable TBIMR tiled rendering") + #define DRI_CONF_INTEL_ENABLE_WA_14018912822(def) \ DRI_CONF_OPT_B(intel_enable_wa_14018912822, def, \ "Intel workaround for using zero blend constants")