From 8206390546972d233724cfc7c8d0f74bcf12b807 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 20 May 2019 10:28:01 +0200 Subject: [PATCH] radv: remove one useless image type in the fmask expand shader Both input and output images use the same type. Signed-off-by: Samuel Pitoiset Reviewed-By: Bas Nieuwenhuizen --- src/amd/vulkan/radv_meta_fmask_expand.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c index f4b55328929..12533935348 100644 --- a/src/amd/vulkan/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/radv_meta_fmask_expand.c @@ -30,10 +30,7 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples) { nir_builder b; char name[64]; - const struct glsl_type *input_img_type = - glsl_sampler_type(GLSL_SAMPLER_DIM_MS, false, false, - GLSL_TYPE_FLOAT); - const struct glsl_type *output_img_type = + const struct glsl_type *img_type = glsl_sampler_type(GLSL_SAMPLER_DIM_MS, false, false, GLSL_TYPE_FLOAT); @@ -46,12 +43,12 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples) b.shader->info.cs.local_size[2] = 1; nir_variable *input_img = nir_variable_create(b.shader, nir_var_uniform, - input_img_type, "s_tex"); + img_type, "s_tex"); input_img->data.descriptor_set = 0; input_img->data.binding = 0; nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, - output_img_type, "out_img"); + img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; -- 2.30.2