[Mesa-dev] [PATCH 1/4] radv: drop unused code related to 16 sample locations

[Samuel Pitoiset]

The driver only supports up to 8 sample locations.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/vulkan/radv_device.c       | 2 --
 src/amd/vulkan/radv_meta_resolve.c | 8 --------
 src/amd/vulkan/radv_nir_to_llvm.c  | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 6cadbe722ae..b2112a6ed34 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2093,8 +2093,6 @@ fill_geom_tess_rings(struct radv_queue *queue,
 	memcpy(desc, queue->device->sample_locations_4x, 32);
 	desc += 8;
 	memcpy(desc, queue->device->sample_locations_8x, 64);
-	desc += 16;
-	memcpy(desc, queue->device->sample_locations_16x, 128);
 }
 
 static unsigned
diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index 7ce36b1df6e..6a7cbfe8468 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -456,14 +456,6 @@ void radv_CmdResolveImage(
 	}
 	assert(dest_image->info.samples == 1);
 
-	if (src_image->info.samples >= 16) {
-		/* See commit aa3f9aaf31e9056a255f9e0472ebdfdaa60abe54 for the
-		 * glBlitFramebuffer workaround for samples >= 16.
-		 */
-		radv_finishme("vkCmdResolveImage: need interpolation workaround when "
-			      "samples >= 16");
-	}
-
 	if (src_image->info.array_size > 1)
 		radv_finishme("vkCmdResolveImage: multisample array images");
 
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 9d0aa411528..40812fa7ffb 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1690,9 +1690,6 @@ radv_get_sample_pos_offset(uint32_t num_samples)
 	case 8:
 		sample_pos_offset = 7;
 		break;
-	case 16:
-		sample_pos_offset = 15;
-		break;
 	default:
 		break;
 	}
-- 
2.20.1