anv: remove vk_sample_locations_state from emit_multisample

State for sample locations is not used within this function.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18669>

diff --git a/src/intel/vulkan/anv_genX.h b/src/intel/vulkan/anv_genX.h
index 6c2a8cb..45ff550 100644 (file)
--- a/src/intel/vulkan/anv_genX.h
+++ b/src/intel/vulkan/anv_genX.h
@@ -130,8 +130,7 @@ genX(emit_urb_setup)(struct anv_device *device, struct anv_batch *batch,
                      const unsigned entry_size[4],
                      enum intel_urb_deref_block_size *deref_block_size);
 
-void genX(emit_multisample)(struct anv_batch *batch, uint32_t samples,
-                            const struct vk_sample_locations_state *sl);
+void genX(emit_multisample)(struct anv_batch *batch, uint32_t samples);
 
 void genX(emit_sample_pattern)(struct anv_batch *batch,
                                const struct vk_sample_locations_state *sl);

diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index dd5b376..495b9cc 100644 (file)
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -756,8 +756,7 @@ emit_ms_state(struct anv_graphics_pipeline *pipeline,
 {
    /* On Gfx8+ 3DSTATE_MULTISAMPLE only holds the number of samples. */
    genX(emit_multisample)(&pipeline->base.batch,
-                          pipeline->rasterization_samples,
-                          NULL);
+                          pipeline->rasterization_samples);
 
    /* From the Vulkan 1.0 spec:
     *    If pSampleMask is NULL, it is treated as if the mask has all bits

diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c
index c813086..9d0b7c2 100644 (file)
--- a/src/intel/vulkan/genX_state.c
+++ b/src/intel/vulkan/genX_state.c
@@ -622,17 +622,8 @@ genX(emit_l3_config)(struct anv_batch *batch,
 }
 
 void
-genX(emit_multisample)(struct anv_batch *batch, uint32_t samples,
-                       const struct vk_sample_locations_state *sl)
+genX(emit_multisample)(struct anv_batch *batch, uint32_t samples)
 {
-   if (sl != NULL) {
-      assert(sl->per_pixel == samples);
-      assert(sl->grid_size.width == 1);
-      assert(sl->grid_size.height == 1);
-   } else {
-      sl = vk_standard_sample_locations_state(samples);
-   }
-
    anv_batch_emit(batch, GENX(3DSTATE_MULTISAMPLE), ms) {
       ms.NumberofMultisamples       = __builtin_ffs(samples) - 1;