radv: Use nir_var_mem_image in meta shaders

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4743>

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;
 

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;
 

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;
 

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;
 

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;

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;