radv: Add extra struct to image view creation.

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

diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c
index a205686e55392f5f7940dcd004dc55b4e3a7b609..16c5b93c093bb96883896116c2c1de017de77c5b 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit.c
+++ b/src/amd/vulkan/radv_meta_blit.c
@@ -128,7 +128,7 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim)
        unsigned swz[] = { 0, (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 1), 2 };
        nir_ssa_def *const tex_pos =
                nir_swizzle(&b, nir_load_var(&b, tex_pos_in), swz,
-                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3), false);
+                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3));
 
        const struct glsl_type *sampler_type =
                glsl_sampler_type(tex_dim, false, tex_dim != GLSL_SAMPLER_DIM_3D,
@@ -186,7 +186,7 @@ build_nir_copy_fragment_shader_depth(enum glsl_sampler_dim tex_dim)
        unsigned swz[] = { 0, (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 1), 2 };
        nir_ssa_def *const tex_pos =
                nir_swizzle(&b, nir_load_var(&b, tex_pos_in), swz,
-                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3), false);
+                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3));
 
        const struct glsl_type *sampler_type =
                glsl_sampler_type(tex_dim, false, tex_dim != GLSL_SAMPLER_DIM_3D,
@@ -244,7 +244,7 @@ build_nir_copy_fragment_shader_stencil(enum glsl_sampler_dim tex_dim)
        unsigned swz[] = { 0, (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 1), 2 };
        nir_ssa_def *const tex_pos =
                nir_swizzle(&b, nir_load_var(&b, tex_pos_in), swz,
-                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3), false);
+                           (tex_dim == GLSL_SAMPLER_DIM_1D ? 2 : 3));
 
        const struct glsl_type *sampler_type =
                glsl_sampler_type(tex_dim, false, tex_dim != GLSL_SAMPLER_DIM_3D,
@@ -307,7 +307,7 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer,
                VkOffset2D dest_offset_0,
                VkOffset2D dest_offset_1,
                VkRect2D dest_box,
-               VkFilter blit_filter)
+               VkSampler sampler)
 {
        struct radv_device *device = cmd_buffer->device;
        uint32_t src_width = radv_minify(src_iview->image->info.width, src_iview->base_mip);
@@ -331,17 +331,6 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer,
                              VK_SHADER_STAGE_VERTEX_BIT, 0, 20,
                              vertex_push_constants);
 
-       VkSampler sampler;
-       radv_CreateSampler(radv_device_to_handle(device),
-                                &(VkSamplerCreateInfo) {
-                                        .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
-                                                .magFilter = blit_filter,
-                                                .minFilter = blit_filter,
-                                                .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                .addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                }, &cmd_buffer->pool->alloc, &sampler);
-
        VkFramebuffer fb;
        radv_CreateFramebuffer(radv_device_to_handle(device),
                               &(VkFramebufferCreateInfo) {
@@ -384,7 +373,7 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer,
                        pipeline = &device->meta_state.blit.pipeline_3d_src[fs_key];
                        break;
                default:
-                       unreachable(!"bad VkImageType");
+                       unreachable("bad VkImageType");
                }
                break;
        }
@@ -413,7 +402,7 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer,
                        pipeline = &device->meta_state.blit.depth_only_3d_pipeline;
                        break;
                default:
-                       unreachable(!"bad VkImageType");
+                       unreachable("bad VkImageType");
                }
                break;
        }
@@ -442,12 +431,12 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer,
                        pipeline = &device->meta_state.blit.stencil_only_3d_pipeline;
                        break;
                default:
-                       unreachable(!"bad VkImageType");
+                       unreachable("bad VkImageType");
                }
                break;
        }
        default:
-               unreachable(!"bad VkImageType");
+               unreachable("bad VkImageType");
        }
 
        if (!*pipeline) {
@@ -510,8 +499,6 @@ fail_pipeline:
        /* TODO: above comment is not valid for at least descriptor sets/pools,
         * as we may not free them till after execution finishes. Check others. */
 
-       radv_DestroySampler(radv_device_to_handle(device), sampler,
-                           &cmd_buffer->pool->alloc);
        radv_DestroyFramebuffer(radv_device_to_handle(device), fb,
                                &cmd_buffer->pool->alloc);
 }
@@ -550,8 +537,10 @@ void radv_CmdBlitImage(
        RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
        RADV_FROM_HANDLE(radv_image, src_image, srcImage);
        RADV_FROM_HANDLE(radv_image, dest_image, destImage);
+       struct radv_device *device = cmd_buffer->device;
        struct radv_meta_saved_state saved_state;
        bool old_predicating;
+       VkSampler sampler;
 
        /* From the Vulkan 1.0 spec:
         *
@@ -561,6 +550,16 @@ void radv_CmdBlitImage(
        assert(src_image->info.samples == 1);
        assert(dest_image->info.samples == 1);
 
+       radv_CreateSampler(radv_device_to_handle(device),
+                          &(VkSamplerCreateInfo) {
+                               .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
+                               .magFilter = filter,
+                               .minFilter = filter,
+                               .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                               .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                               .addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                          }, &cmd_buffer->pool->alloc, &sampler);
+
        radv_meta_save(&saved_state, cmd_buffer,
                       RADV_META_SAVE_GRAPHICS_PIPELINE |
                       RADV_META_SAVE_CONSTANTS |
@@ -661,7 +660,7 @@ void radv_CmdBlitImage(
                                                             .baseArrayLayer = dest_array_slice,
                                                             .layerCount = 1
                                                     },
-                                            });
+                                            }, NULL);
                        radv_image_view_init(&src_iview, cmd_buffer->device,
                                             &(VkImageViewCreateInfo) {
                                                .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
@@ -675,14 +674,14 @@ void radv_CmdBlitImage(
                                                        .baseArrayLayer = src_array_slice,
                                                        .layerCount = 1
                                                },
-                                       });
+                                       }, NULL);
                        meta_emit_blit(cmd_buffer,
                                       src_image, &src_iview, srcImageLayout,
                                       src_offset_0, src_offset_1,
                                       dest_image, &dest_iview, destImageLayout,
                                       dest_offset_0, dest_offset_1,
                                       dest_box,
-                                      filter);
+                                      sampler);
                }
        }
 
@@ -690,6 +689,9 @@ void radv_CmdBlitImage(
        cmd_buffer->state.predicating = old_predicating;
 
        radv_meta_restore(&saved_state, cmd_buffer);
+
+       radv_DestroySampler(radv_device_to_handle(device), sampler,
+                           &cmd_buffer->pool->alloc);
 }
 
 void
@@ -847,54 +849,60 @@ build_pipeline(struct radv_device *device,
                .subpass = 0,
        };
 
-       switch(aspect) {
-       case VK_IMAGE_ASPECT_COLOR_BIT:
-               vk_pipeline_info.pColorBlendState = &(VkPipelineColorBlendStateCreateInfo) {
-                       .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
-                       .attachmentCount = 1,
-                       .pAttachments = (VkPipelineColorBlendAttachmentState []) {
-                               { .colorWriteMask =
-                               VK_COLOR_COMPONENT_A_BIT |
-                               VK_COLOR_COMPONENT_R_BIT |
-                               VK_COLOR_COMPONENT_G_BIT |
-                               VK_COLOR_COMPONENT_B_BIT },
+       VkPipelineColorBlendStateCreateInfo color_blend_info = {
+               .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
+               .attachmentCount = 1,
+               .pAttachments = (VkPipelineColorBlendAttachmentState []) {
+                       {
+                               .colorWriteMask = VK_COLOR_COMPONENT_A_BIT |
+                                                 VK_COLOR_COMPONENT_R_BIT |
+                                                 VK_COLOR_COMPONENT_G_BIT |
+                                                 VK_COLOR_COMPONENT_B_BIT },
                        }
                };
+
+       VkPipelineDepthStencilStateCreateInfo depth_info = {
+               .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
+               .depthTestEnable = true,
+               .depthWriteEnable = true,
+               .depthCompareOp = VK_COMPARE_OP_ALWAYS,
+       };
+
+       VkPipelineDepthStencilStateCreateInfo stencil_info = {
+               .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
+               .depthTestEnable = false,
+               .depthWriteEnable = false,
+               .stencilTestEnable = true,
+               .front = {
+                       .failOp = VK_STENCIL_OP_REPLACE,
+                       .passOp = VK_STENCIL_OP_REPLACE,
+                       .depthFailOp = VK_STENCIL_OP_REPLACE,
+                       .compareOp = VK_COMPARE_OP_ALWAYS,
+                       .compareMask = 0xff,
+                       .writeMask = 0xff,
+                       .reference = 0
+               },
+               .back = {
+                       .failOp = VK_STENCIL_OP_REPLACE,
+                       .passOp = VK_STENCIL_OP_REPLACE,
+                       .depthFailOp = VK_STENCIL_OP_REPLACE,
+                       .compareOp = VK_COMPARE_OP_ALWAYS,
+                       .compareMask = 0xff,
+                       .writeMask = 0xff,
+                       .reference = 0
+               },
+               .depthCompareOp = VK_COMPARE_OP_ALWAYS,
+       };
+
+       switch(aspect) {
+       case VK_IMAGE_ASPECT_COLOR_BIT:
+               vk_pipeline_info.pColorBlendState = &color_blend_info;
                break;
        case VK_IMAGE_ASPECT_DEPTH_BIT:
-               vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) {
-                       .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
-                       .depthTestEnable = true,
-                       .depthWriteEnable = true,
-                       .depthCompareOp = VK_COMPARE_OP_ALWAYS,
-               };
+               vk_pipeline_info.pDepthStencilState = &depth_info;
                break;
        case VK_IMAGE_ASPECT_STENCIL_BIT:
-               vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) {
-                       .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
-                       .depthTestEnable = false,
-                       .depthWriteEnable = false,
-                       .stencilTestEnable = true,
-                       .front = {
-                               .failOp = VK_STENCIL_OP_REPLACE,
-                               .passOp = VK_STENCIL_OP_REPLACE,
-                               .depthFailOp = VK_STENCIL_OP_REPLACE,
-                               .compareOp = VK_COMPARE_OP_ALWAYS,
-                               .compareMask = 0xff,
-                               .writeMask = 0xff,
-                               .reference = 0
-                       },
-                       .back = {
-                               .failOp = VK_STENCIL_OP_REPLACE,
-                               .passOp = VK_STENCIL_OP_REPLACE,
-                               .depthFailOp = VK_STENCIL_OP_REPLACE,
-                               .compareOp = VK_COMPARE_OP_ALWAYS,
-                               .compareMask = 0xff,
-                               .writeMask = 0xff,
-                               .reference = 0
-                       },
-                       .depthCompareOp = VK_COMPARE_OP_ALWAYS,
-               };
+               vk_pipeline_info.pDepthStencilState = &stencil_info;
                break;
        default:
                unreachable("Unhandled aspect");
@@ -948,8 +956,8 @@ radv_device_init_meta_blit_color(struct radv_device *device, bool on_demand)
                                                                        .attachment = VK_ATTACHMENT_UNUSED,
                                                                        .layout = VK_IMAGE_LAYOUT_GENERAL,
                                                                },
-                                                               .preserveAttachmentCount = 1,
-                                                               .pPreserveAttachments = (uint32_t[]) { 0 },
+                                                               .preserveAttachmentCount = 0,
+                                                               .pPreserveAttachments = NULL,
                                                        },
                                                        .dependencyCount = 0,
                                                }, &device->meta_state.alloc, &device->meta_state.blit.render_pass[key][j]);
@@ -1008,8 +1016,8 @@ radv_device_init_meta_blit_depth(struct radv_device *device, bool on_demand)
                                                                       .attachment = 0,
                                                                       .layout = layout,
                                                                },
-                                                              .preserveAttachmentCount = 1,
-                                                              .pPreserveAttachments = (uint32_t[]) { 0 },
+                                                              .preserveAttachmentCount = 0,
+                                                              .pPreserveAttachments = NULL,
                                                        },
                                                        .dependencyCount = 0,
                                                }, &device->meta_state.alloc, &device->meta_state.blit.depth_only_rp[ds_layout]);
@@ -1065,8 +1073,8 @@ radv_device_init_meta_blit_stencil(struct radv_device *device, bool on_demand)
                                                                       .attachment = 0,
                                                                       .layout = layout,
                                                               },
-                                                              .preserveAttachmentCount = 1,
-                                                              .pPreserveAttachments = (uint32_t[]) { 0 },
+                                                              .preserveAttachmentCount = 0,
+                                                              .pPreserveAttachments = NULL,
                                                       },
                                                       .dependencyCount = 0,
                                         }, &device->meta_state.alloc, &device->meta_state.blit.stencil_only_rp[ds_layout]);