From e2e7fce6e9e7df52b6d66af13b6f2d4bb8c28855 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 18:09:09 +0200
Subject: [PATCH] radv: rename radv_zero_vram to vk_zero_vram

More common and this implicitly enables this for Path Of Exile and X4
Foundations. Though, zero VRAM allocs is already the default in AMDGPU,
so that doesn't change anything in practice (except for very old
kernels).

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41735>
---
 src/amd/vulkan/radv_drirc_gen.py |  6 ++---
 src/util/00-radv-defaults.conf   | 42 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/amd/vulkan/radv_drirc_gen.py b/src/amd/vulkan/radv_drirc_gen.py
index b0a3dfb29b8..04739030ea0 100644
--- a/src/amd/vulkan/radv_drirc_gen.py
+++ b/src/amd/vulkan/radv_drirc_gen.py
@@ -23,6 +23,9 @@ def declare_options():
         B("vk_x11_ignore_suboptimal", False,
           "Force the X11 WSI to never report VK_SUBOPTIMAL_KHR"),
 
+        B("vk_zero_vram", False,
+          "Initialize to zero all VRAM allocations",
+          c_name="zero_vram"),
         B("radv_disable_aniso_single_level", False,
           "Disable anisotropic filtering for single level images",
           c_name="disable_aniso_single_level"),
@@ -74,9 +77,6 @@ def declare_options():
         B("radv_tex_non_uniform", False,
           "Always mark texture sample operations as non-uniform.",
           c_name="tex_non_uniform"),
-        B("radv_zero_vram", False,
-          "Initialize to zero all VRAM allocations",
-          c_name="zero_vram"),
         B("radv_wait_for_vm_map_updates", False,
           "Wait for VM MAP updates at allocation time to mitigate use-before-alloc",
           c_name="wait_for_vm_map_updates"),
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index 97fbfead76b..0b38f65874c 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -39,7 +39,7 @@ Application bugs worked around in this file:
     <device driver="radv">
         <!-- Engine workarounds -->
         <engine engine_name_match="vkd3d">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
             <option name="radv_disable_aniso_single_level" value="true" />
             <option name="radv_disable_trunc_coord" value="true" />
             <option name="radv_cooperative_matrix2_nv" value="true" />
@@ -55,7 +55,7 @@ Application bugs worked around in this file:
         </engine>
 
         <engine engine_name_match="Quantic Dream Engine">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
             <option name="radv_disable_tc_compat_htile_general" value="true" />
             <option name="radv_app_layer" value="quanticdream" />
         </engine>
@@ -63,7 +63,7 @@ Application bugs worked around in this file:
         <engine engine_name_match="^UnrealEngine"> <!-- UE4/5 Vulkan RHI -->
             <option name="radv_flush_before_query_copy" value="true" />
             <option name="radv_flush_before_timestamp_write" value="true" />
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </engine>
 
         <engine engine_name_match="DXVK_NvRemix">
@@ -95,12 +95,12 @@ Application bugs worked around in this file:
         <application name="RAGE 2" application_name_match="Rage 2">
             <option name="radv_enable_mrt_output_nan_fixup" value="true" />
             <option name="radv_app_layer" value="rage2" />
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="The Surge 2" application_name_match="Fledge">
             <option name="radv_disable_shrink_image_store" value="true" />
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="World War Z (and World War Z: Aftermath)" application_name_match="WWZ|wwz">
@@ -114,11 +114,11 @@ Application bugs worked around in this file:
         </application>
 
         <application name="DOOM Eternal" application_name_match="DOOMEternal">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="Indiana Jones: The Great Circle" application_name_match="TheGreatCircle">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
             <option name="radv_disable_dcc_stores" value="true" />
             <option name="radv_invariant_geom" value="true" />
             <option name="radv_emulate_rt" value="true" />
@@ -135,7 +135,7 @@ Application bugs worked around in this file:
         </application>
 
         <application name="DOOM: The Dark Ages" application_name_match="DOOMTheDarkAges">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
             <option name="radv_disable_dcc_stores" value="true" />
             <option name="radv_no_implicit_varying_subgroup_size" value="true" />
         </application>
@@ -153,7 +153,7 @@ Application bugs worked around in this file:
         </application>
 
         <application name="Hammerting" application_name_match="TDTD">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="RDR2" application_name_match="Red Dead Redemption 2">
@@ -163,7 +163,7 @@ Application bugs worked around in this file:
                  256MiB to workaround bad VRAM memory management. -->
             <option name="radv_hide_rebar_on_dgpu" value="true" />
 
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
             <!-- Disable DCC for mips to workaround rendering issues because
                  the game aliases two images incorrectly. -->
             <option name="radv_disable_dcc_mips" value="true" />
@@ -208,7 +208,7 @@ Application bugs worked around in this file:
         </application>
 
         <application name="GPUScore: Breaking Limit" application_name_match="GPUScoreVulkan">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="DiRT4" application_name_match="dirt4.exe">
@@ -295,15 +295,15 @@ Application bugs worked around in this file:
 
         <!-- OpenGL Game workarounds (zink) -->
         <application name="Black Geyser: Couriers of Darkness" executable="BlackGeyser.x86_64">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2686 -->
         <application name="7 Days to Die" executable="7DaysToDie.x86_64">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
         <application name="7 Days to Die" executable="7DaysToDie.x86">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <!-- This applies to all apps having "runner" as their executable, but that's OK.
@@ -311,30 +311,30 @@ Application bugs worked around in this file:
             - Monolith demo5
         -->
         <application name="any runner executable" executable="runner">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="American Truck Simulator" executable="amtrucks">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="Counter-Strike Global Offensive" executable="csgo_linux64">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="Exanima" executable="Exanima.exe">
-            <option name="radv_zero_vram" value="true"/>
+            <option name="vk_zero_vram" value="true"/>
         </application>
 
         <application name="Rocket League" executable="RocketLeague">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
         <application name="Crystal Project" executable="Crystal Project.bin.x86_64">
-            <option name="radv_zero_vram" value="true" />
+            <option name="vk_zero_vram" value="true" />
         </application>
 
         <application name="Enshrouded" executable="enshrouded.exe">
-            <option name="radv_zero_vram" value="true"/>
+            <option name="vk_zero_vram" value="true"/>
         </application>
 
         <application name="No Man's Sky" application_name_match="No Man's Sky">