From 05b253585506843912583f06fbd9ad45b3a7442d Mon Sep 17 00:00:00 2001
From: Sylvain BERTRAND <sylvain.bertrand@legeek.net>
Date: Sat, 2 Nov 2024 17:25:20 +0000
Subject: [PATCH] "more reasonably implemented" vulkan ready for next AMD gpu
 hardware

---
 .../contrib/generators.sh                          |  2 ++
 .../contrib/radv_physical_device.c.patch           | 26 ++++++++++++++++++++++
 .../x86_64_amdgpu_linux_gnu_vulkan_x11_drm_gcc.sh  |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/radv_physical_device.c.patch

diff --git a/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/generators.sh b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/generators.sh
index 45bf7d0..aa5761c 100644
--- a/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/generators.sh
+++ b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/generators.sh
@@ -18,6 +18,8 @@ cp -f $src_dir/src/amd/vulkan/meta/radv_meta_copy.c $build_dir/src/amd/vulkan/me
 patch -p 1 -i $src_dir/contrib/radv_meta_copy.c.patch
 cp -f $src_dir/src/amd/vulkan/radv_device.c $build_dir/src/amd/vulkan
 patch -p 1 -i $src_dir/contrib/radv_device.c.patch
+cp -f $src_dir/src/amd/vulkan/radv_physical_device.c $build_dir/src/amd/vulkan
+patch -p 1 -i $src_dir/contrib/radv_physical_device.c.patch
 # dudes... tracers should be cleanly compilable out... smells forced corpo crap
 cp -f $src_dir/contrib/radv_no_tracers.c $build_dir/src/amd/vulkan
 #===============================================================================
diff --git a/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/radv_physical_device.c.patch b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/radv_physical_device.c.patch
new file mode 100644
index 0000000..4f30a47
--- /dev/null
+++ b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/radv_physical_device.c.patch
@@ -0,0 +1,26 @@
+--- a/src/amd/vulkan/radv_physical_device.c
++++ b/src/amd/vulkan/radv_physical_device.c
+@@ -111,13 +111,7 @@ radv_filter_minmax_enabled(const struct radv_physical_device *pdev)
+ bool
+ radv_enable_rt(const struct radv_physical_device *pdev, bool rt_pipelines)
+ {
+-   if (pdev->info.gfx_level < GFX10_3 && !radv_emulate_rt(pdev))
+-      return false;
+-
+-   if (rt_pipelines && pdev->use_llvm)
+-      return false;
+-
+-   return true;
++   return false; // until reasonable or full hardware implementation
+ }
+ 
+ bool
+@@ -791,7 +785,7 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc
+       .multiViewport = true,
+       .samplerAnisotropy = true,
+       .textureCompressionETC2 = pdev->info.has_etc_support || pdev->emulate_etc2,
+-      .textureCompressionASTC_LDR = pdev->emulate_astc,
++      .textureCompressionASTC_LDR = false, // until really obsolete, or reasonable implementation
+       .textureCompressionBC = true,
+       .occlusionQueryPrecise = true,
+       .pipelineStatisticsQuery = true,
diff --git a/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/x86_64_amdgpu_linux_gnu_vulkan_x11_drm_gcc.sh b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/x86_64_amdgpu_linux_gnu_vulkan_x11_drm_gcc.sh
index f14c83b..972b4b4 100755
--- a/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/x86_64_amdgpu_linux_gnu_vulkan_x11_drm_gcc.sh
+++ b/builders/mesa-vulkan-amd-sh-ab1479ae6a845d2c7beeb0fed6e2153cc2b16c5e/contrib/x86_64_amdgpu_linux_gnu_vulkan_x11_drm_gcc.sh
@@ -1362,7 +1362,7 @@ $src_dir/src/amd/vulkan/nir/radv_nir_remap_color_attachment.c \
 $src_dir/src/amd/vulkan/nir/radv_nir_rt_common.c \
 $src_dir/src/amd/vulkan/nir/radv_nir_rt_shader.c \
 $src_dir/src/amd/vulkan/radv_perfcounter.c \
-$src_dir/src/amd/vulkan/radv_physical_device.c \
+$build_dir/src/amd/vulkan/radv_physical_device.c \
 $src_dir/src/amd/vulkan/radv_pipeline.c \
 $src_dir/src/amd/vulkan/radv_pipeline_binary.c \
 $src_dir/src/amd/vulkan/radv_pipeline_compute.c \
-- 
2.11.4.GIT