From 90ed2872bc7f03a42cf1d418a0bd635a52d87026 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 18 Apr 2017 15:29:21 +1000 Subject: [PATCH] radv/meta: move fast clear to generate vertices in shader. Avoids having to setup vertex buffers. Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- src/amd/vulkan/radv_meta_fast_clear.c | 74 +++------------------------ 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c index 3393bcb25ea..5f792f1f894 100644 --- a/src/amd/vulkan/radv_meta_fast_clear.c +++ b/src/amd/vulkan/radv_meta_fast_clear.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_fast_clear_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; } @@ -154,24 +145,8 @@ create_pipeline(struct radv_device *device, const VkPipelineVertexInputStateCreateInfo vi_state = { .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, }; const VkPipelineInputAssemblyStateCreateInfo ia_state = { @@ -364,43 +339,6 @@ emit_fast_clear_flush(struct radv_cmd_buffer *cmd_buffer, { 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 }); VkPipeline pipeline_h; if (fmask_decompress) @@ -448,7 +386,7 @@ radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer, assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL); 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 < layer_count; ++layer) { struct radv_image_view iview; -- 2.30.2