From 600d34c8228b4d5e8468b56a8ba23d82a0790583 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 15 Jun 2018 08:48:54 +1000 Subject: [PATCH] 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 --- src/amd/vulkan/radv_pipeline.c | 2 -- src/amd/vulkan/radv_private.h | 1 - src/amd/vulkan/radv_shader.h | 1 - 3 files changed, 4 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 6eeedc6..ccbcbba 100644 --- 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 316fbc9..7841d70 100644 --- 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 05de188..5b2284e 100644 --- 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 { -- 2.7.4