mesa: add no error support to teximage()

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

diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 854b88a3622edaabdad9792286ce464965379337..5a34863690762b16b6eae2ea64b639a0e273de8d 100644 (file)
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -26,53 +26,7 @@
 
 #include "radv_meta.h"
 #include "radv_private.h"
-#include "nir/nir_builder.h"
 #include "sid.h"
-/**
- * Vertex attributes used by all pipelines.
- */
-struct vertex_attrs {
-       float position[2]; /**< 3DPRIM_RECTLIST */
-};
-
-/* passthrough vertex shader */
-static nir_shader *
-build_nir_vs(void)
-{
-       const struct glsl_type *vec4 = glsl_vec4_type();
-
-       nir_builder b;
-       nir_variable *a_position;
-       nir_variable *v_position;
-
-       nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_VERTEX, NULL);
-       b.shader->info->name = ralloc_strdup(b.shader, "meta_depth_decomp_vs");
-
-       a_position = nir_variable_create(b.shader, nir_var_shader_in, vec4,
-                                        "a_position");
-       a_position->data.location = VERT_ATTRIB_GENERIC0;
-
-       v_position = nir_variable_create(b.shader, nir_var_shader_out, vec4,
-                                        "gl_Position");
-       v_position->data.location = VARYING_SLOT_POS;
-
-       nir_copy_var(&b, v_position, a_position);
-
-       return b.shader;
-}
-
-/* simple passthrough shader */
-static nir_shader *
-build_nir_fs(void)
-{
-       nir_builder b;
-
-       nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL);
-       b.shader->info->name = ralloc_asprintf(b.shader,
-                                              "meta_depth_decomp_noop_fs");
-
-       return b.shader;
-}
 
 static VkResult
 create_pass(struct radv_device *device)
@@ -124,7 +78,7 @@ create_pipeline(struct radv_device *device,
        VkDevice device_h = radv_device_to_handle(device);
 
        struct radv_shader_module fs_module = {
-               .nir = build_nir_fs(),
+               .nir = radv_meta_build_nir_fs_noop(),
        };
 
        if (!fs_module.nir) {
@@ -152,24 +106,8 @@ create_pipeline(struct radv_device *device,
                },
                .pVertexInputState = &(VkPipelineVertexInputStateCreateInfo) {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-                       .vertexBindingDescriptionCount = 1,
-                       .pVertexBindingDescriptions = (VkVertexInputBindingDescription[]) {
-                               {
-                                       .binding = 0,
-                                       .stride = sizeof(struct vertex_attrs),
-                                       .inputRate = VK_VERTEX_INPUT_RATE_VERTEX
-                               },
-                       },
-                       .vertexAttributeDescriptionCount = 1,
-                       .pVertexAttributeDescriptions = (VkVertexInputAttributeDescription[]) {
-                               {
-                                       /* Position */
-                                       .location = 0,
-                                       .binding = 0,
-                                       .format = VK_FORMAT_R32G32_SFLOAT,
-                                       .offset = offsetof(struct vertex_attrs, position),
-                               },
-                       },
+                       .vertexBindingDescriptionCount = 0,
+                       .vertexAttributeDescriptionCount = 0,
                },
                .pInputAssemblyState = &(VkPipelineInputAssemblyStateCreateInfo) {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
@@ -285,7 +223,7 @@ radv_device_init_meta_depth_decomp_state(struct radv_device *device)
 
        zero(device->meta_state.depth_decomp);
 
-       struct radv_shader_module vs_module = { .nir = build_nir_vs() };
+       struct radv_shader_module vs_module = { .nir = radv_meta_build_nir_vs_generate_vertices() };
        if (!vs_module.nir) {
                /* XXX: Need more accurate error */
                res = VK_ERROR_OUT_OF_HOST_MEMORY;
@@ -318,45 +256,7 @@ emit_depth_decomp(struct radv_cmd_buffer *cmd_buffer,
                  const VkExtent2D *depth_decomp_extent,
                  VkPipeline pipeline_h)
 {
-       struct radv_device *device = cmd_buffer->device;
        VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
-       uint32_t offset;
-       const struct vertex_attrs vertex_data[3] = {
-               {
-                       .position = {
-                               -1.0,
-                               -1.0,
-                       },
-               },
-               {
-                       .position = {
-                               -1.0,
-                               1.0,
-                       },
-               },
-               {
-                       .position = {
-                               1.0,
-                               -1.0,
-                       },
-               },
-       };
-
-       radv_cmd_buffer_upload_data(cmd_buffer, sizeof(vertex_data), 16, vertex_data, &offset);
-       struct radv_buffer vertex_buffer = {
-               .device = device,
-               .size = sizeof(vertex_data),
-               .bo = cmd_buffer->upload.upload_bo,
-               .offset = offset,
-       };
-
-       VkBuffer vertex_buffer_h = radv_buffer_to_handle(&vertex_buffer);
-
-       radv_CmdBindVertexBuffers(cmd_buffer_h,
-                                 /*firstBinding*/ 0,
-                                 /*bindingCount*/ 1,
-                                 (VkBuffer[]) { vertex_buffer_h },
-                                 (VkDeviceSize[]) { 0 });
 
        RADV_FROM_HANDLE(radv_pipeline, pipeline, pipeline_h);
 
@@ -392,16 +292,16 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
        struct radv_meta_saved_pass_state saved_pass_state;
        VkDevice device_h = radv_device_to_handle(cmd_buffer->device);
        VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
-       uint32_t width = radv_minify(image->extent.width,
+       uint32_t width = radv_minify(image->info.width,
                                     subresourceRange->baseMipLevel);
-       uint32_t height = radv_minify(image->extent.height,
+       uint32_t height = radv_minify(image->info.height,
                                     subresourceRange->baseMipLevel);
 
        if (!image->surface.htile_size)
                return;
        radv_meta_save_pass(&saved_pass_state, cmd_buffer);
 
-       radv_meta_save_graphics_reset_vport_scissor(&saved_state, cmd_buffer);
+       radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state, cmd_buffer);
 
        for (uint32_t layer = 0; layer < radv_get_layerCount(image, subresourceRange); layer++) {
                struct radv_image_view iview;
@@ -418,8 +318,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                                                     .baseArrayLayer = subresourceRange->baseArrayLayer + layer,
                                                     .layerCount = 1,
                                             },
-                                    },
-                                    cmd_buffer, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
+                                    });
 
 
                VkFramebuffer fb_h;