From 458b4d2095795ded0d46a6851adc2de8392a7372 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Fri, 17 Sep 2021 08:22:06 -0500 Subject: [PATCH] radv: Use nir_var_mem_image in meta shaders Reviewed-by: Jason Ekstrand Part-of: --- src/amd/vulkan/radv_meta_bufimage.c | 14 +++++++------- src/amd/vulkan/radv_meta_clear.c | 2 +- src/amd/vulkan/radv_meta_decompress.c | 4 ++-- src/amd/vulkan/radv_meta_fast_clear.c | 4 ++-- src/amd/vulkan/radv_meta_fmask_expand.c | 2 +- src/amd/vulkan/radv_meta_resolve_cs.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c index 18e558ec13c..8f9801f8630 100644 --- a/src/amd/vulkan/radv_meta_bufimage.c +++ b/src/amd/vulkan/radv_meta_bufimage.c @@ -47,7 +47,7 @@ build_nir_itob_compute_shader(struct radv_device *dev, bool is_3d) input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -229,7 +229,7 @@ build_nir_btoi_compute_shader(struct radv_device *dev, bool is_3d) input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -409,7 +409,7 @@ build_nir_btoi_r32g32b32_compute_shader(struct radv_device *dev) input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -563,7 +563,7 @@ build_nir_itoi_compute_shader(struct radv_device *dev, bool is_3d, int samples) input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -764,7 +764,7 @@ build_nir_itoi_r32g32b32_compute_shader(struct radv_device *dev) input_img->data.binding = 0; nir_variable *output_img = - nir_variable_create(b.shader, nir_var_uniform, img_type, "output_img"); + nir_variable_create(b.shader, nir_var_mem_image, img_type, "output_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -920,7 +920,7 @@ build_nir_cleari_compute_shader(struct radv_device *dev, bool is_3d, int samples b.shader->info.workgroup_size[1] = 8; b.shader->info.workgroup_size[2] = 1; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 0; @@ -1078,7 +1078,7 @@ build_nir_cleari_r32g32b32_compute_shader(struct radv_device *dev) b.shader->info.workgroup_size[1] = 8; b.shader->info.workgroup_size[2] = 1; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 0; diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 31e4a9a2eb7..0b53ec4d51a 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -1175,7 +1175,7 @@ build_clear_dcc_comp_to_single_shader(bool is_msaa) nir_channel(&b, global_id, 2), nir_ssa_undef(&b, 1, 32)); - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 0; diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c index 91d1d04c6b3..647f38f4f29 100644 --- a/src/amd/vulkan/radv_meta_decompress.c +++ b/src/amd/vulkan/radv_meta_decompress.c @@ -45,11 +45,11 @@ build_expand_depth_stencil_compute_shader(struct radv_device *dev) b.shader->info.workgroup_size[0] = 8; b.shader->info.workgroup_size[1] = 8; b.shader->info.workgroup_size[2] = 1; - nir_variable *input_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "in_img"); + nir_variable *input_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "in_img"); input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c index 8b0673d7a32..6e72f63c46a 100644 --- a/src/amd/vulkan/radv_meta_fast_clear.c +++ b/src/amd/vulkan/radv_meta_fast_clear.c @@ -46,11 +46,11 @@ build_dcc_decompress_compute_shader(struct radv_device *dev) b.shader->info.workgroup_size[0] = 16; b.shader->info.workgroup_size[1] = 16; b.shader->info.workgroup_size[2] = 1; - nir_variable *input_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "in_img"); + nir_variable *input_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "in_img"); input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c index 73900244b4a..644e53cf6fa 100644 --- a/src/amd/vulkan/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/radv_meta_fmask_expand.c @@ -43,7 +43,7 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples) input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; output_img->data.access = ACCESS_NON_READABLE; diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c index 72cbf016842..8aca7805c4c 100644 --- a/src/amd/vulkan/radv_meta_resolve_cs.c +++ b/src/amd/vulkan/radv_meta_resolve_cs.c @@ -75,7 +75,7 @@ build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_s input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1; @@ -147,7 +147,7 @@ build_depth_stencil_resolve_compute_shader(struct radv_device *dev, int samples, input_img->data.descriptor_set = 0; input_img->data.binding = 0; - nir_variable *output_img = nir_variable_create(b.shader, nir_var_uniform, img_type, "out_img"); + nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img"); output_img->data.descriptor_set = 0; output_img->data.binding = 1;