radv: Remove image_var stores.

[mesa.git] / src / amd / vulkan / radv_meta_resolve_cs.c

diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c
index 274e64999a5c6a8a35726bba13bbededb31cc665..4a37892b8607e1ad2ab74f939efe3e60dc18bcd9 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/radv_meta_resolve_cs.c
@@ -135,11 +135,11 @@ build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_s
                outval = radv_meta_build_resolve_srgb_conversion(&b, outval);
 
        nir_ssa_def *coord = nir_iadd(&b, global_id, &dst_offset->dest.ssa);
-       nir_intrinsic_instr *store = nir_intrinsic_instr_create(b.shader, nir_intrinsic_image_var_store);
-       store->src[0] = nir_src_for_ssa(coord);
-       store->src[1] = nir_src_for_ssa(nir_ssa_undef(&b, 1, 32));
-       store->src[2] = nir_src_for_ssa(outval);
-       store->variables[0] = nir_deref_var_create(store, output_img);
+       nir_intrinsic_instr *store = nir_intrinsic_instr_create(b.shader, nir_intrinsic_image_deref_store);
+       store->src[0] = nir_src_for_ssa(&nir_build_deref_var(&b, output_img)->dest.ssa);
+       store->src[1] = nir_src_for_ssa(coord);
+       store->src[2] = nir_src_for_ssa(nir_ssa_undef(&b, 1, 32));
+       store->src[3] = nir_src_for_ssa(outval);
        nir_builder_instr_insert(&b, &store->instr);
        return b.shader;
 }
@@ -508,12 +508,48 @@ radv_cmd_buffer_resolve_subpass_cs(struct radv_cmd_buffer *cmd_buffer)
                if (dest_att.attachment == VK_ATTACHMENT_UNUSED)
                        continue;
 
-               emit_resolve(cmd_buffer,
-                            src_iview,
-                            dst_iview,
-                            &(VkOffset2D) { 0, 0 },
-                            &(VkOffset2D) { 0, 0 },
-                            &(VkExtent2D) { fb->width, fb->height });
+               struct radv_image *src_image = src_iview->image;
+               struct radv_image *dst_image = dst_iview->image;
+               for (uint32_t layer = 0; layer < src_image->info.array_size; layer++) {
+
+                       struct radv_image_view tsrc_iview;
+                       radv_image_view_init(&tsrc_iview, cmd_buffer->device,
+                                            &(VkImageViewCreateInfo) {
+                                                    .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
+                                                            .image = radv_image_to_handle(src_image),
+                                                            .viewType = radv_meta_get_view_type(src_image),
+                                                            .format = src_image->vk_format,
+                                                            .subresourceRange = {
+                                                            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+                                                            .baseMipLevel = src_iview->base_mip,
+                                                            .levelCount = 1,
+                                                            .baseArrayLayer = layer,
+                                                            .layerCount = 1,
+                                                    },
+                                            });
+
+                       struct radv_image_view tdst_iview;
+                       radv_image_view_init(&tdst_iview, cmd_buffer->device,
+                                            &(VkImageViewCreateInfo) {
+                                                    .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
+                                                            .image = radv_image_to_handle(dst_image),
+                                                            .viewType = radv_meta_get_view_type(dst_image),
+                                                            .format = vk_to_non_srgb_format(dst_image->vk_format),
+                                                            .subresourceRange = {
+                                                            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+                                                            .baseMipLevel = dst_iview->base_mip,
+                                                            .levelCount = 1,
+                                                            .baseArrayLayer = layer,
+                                                            .layerCount = 1,
+                                                    },
+                                            });
+                       emit_resolve(cmd_buffer,
+                                    &tsrc_iview,
+                                    &tdst_iview,
+                                    &(VkOffset2D) { 0, 0 },
+                                    &(VkOffset2D) { 0, 0 },
+                                    &(VkExtent2D) { fb->width, fb->height });
+               }
        }
 
        cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH |