radv: remove multisample bit from shader key.

This wasn't being used anywhere inside the shader from what I can see.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 6eeedc65a399bac8dcc58b4b94ed57592fee75d9..ccbcbbadd55e672a572a25c1314c1212b25c6989 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1868,7 +1868,6 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
            pCreateInfo->pMultisampleState->rasterizationSamples > 1) {
                uint32_t num_samples = pCreateInfo->pMultisampleState->rasterizationSamples;
                uint32_t ps_iter_samples = radv_pipeline_get_ps_iter_samples(pCreateInfo->pMultisampleState);
-               key.multisample = true;
                key.log2_num_samples = util_logbase2(num_samples);
                key.log2_ps_iter_samples = util_logbase2(ps_iter_samples);
        }
@@ -1909,7 +1908,6 @@ radv_fill_shader_keys(struct radv_shader_variant_key *keys,
        for(int i = 0; i < MESA_SHADER_STAGES; ++i)
                keys[i].has_multiview_view_index = key->has_multiview_view_index;
 
-       keys[MESA_SHADER_FRAGMENT].fs.multisample = key->multisample;
        keys[MESA_SHADER_FRAGMENT].fs.col_format = key->col_format;
        keys[MESA_SHADER_FRAGMENT].fs.is_int8 = key->is_int8;
        keys[MESA_SHADER_FRAGMENT].fs.is_int10 = key->is_int10;

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 316fbc9af1d218225a2901ece067a672c378e3df..7841d70deea7f7bbf82d31e250038990c18809ec 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -360,7 +360,6 @@ struct radv_pipeline_key {
        uint32_t is_int10;
        uint8_t log2_ps_iter_samples;
        uint8_t log2_num_samples;
-       uint32_t multisample : 1;
        uint32_t has_multiview_view_index : 1;
        uint32_t optimisations_disabled : 1;
 };

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 05de188e3f3a3d41f4828c666499b3af27c81870..5b2284efcfdd8311e53083fe95de9d967d1963fd 100644 (file)
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -98,7 +98,6 @@ struct radv_fs_variant_key {
        uint8_t log2_num_samples;
        uint32_t is_int8;
        uint32_t is_int10;
-       uint32_t multisample : 1;
 };
 
 struct radv_shader_variant_key {