radv/meta: move depth decompress to using inline vertex data

This removes the vertex buffer, and just generates the values
in the shader.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 854b88a3622edaabdad9792286ce464965379337..3566fa7f7315b9bb0d19ae959d55bc1df72ef24c 100644 (file)
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -28,35 +28,26 @@
 #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 */
+/* vertex shader that generates vertices */
 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;
+       nir_ssa_def *outvec = radv_meta_gen_rect_vertices(&b);
 
        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);
+       nir_store_var(&b, v_position, outvec, 0xf);
 
        return b.shader;
 }
@@ -152,24 +143,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,
@@ -318,45 +293,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);
 
@@ -401,7 +338,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                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;