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 a2ba7e4502241c062509b564f4e947f490679395..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,
@@ -660,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,
@@ -674,7 +674,7 @@ 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,
@@ -849,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");