commit ce532f7eb8ce347a0bc2c7d848d5017fa31d2533
author Chia-I Wu <olv@lunarg.com> Mon Oct 26 17:32:47 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Nov 02 14:17:21 2015 -0700
tree b1d340b4b0fb21634637902548371b013134402f
parent 2c24bfe0717414baca4fab63d420a8e39670b910

MR 542: Remaining items from the cleanup bug (WIP)

depthStencilAttachment is replaced by pDepthStencilAttachment.

s/VK_CULL_MODE_FRONT\b/VK_CULL_MODE_FRONT_BIT/g
s/VK_CULL_MODE_BACK\b/VK_CULL_MODE_BACK_BIT/g
s/VK_SAMPLER_ADDRESS_MODE_WRAP\b/VK_SAMPLER_ADDRESS_MODE_REPEAT/g
s/VK_SAMPLER_ADDRESS_MODE_MIRROR\b/VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT/g
s/VK_SAMPLER_ADDRESS_MODE_CLAMP\b/VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE/g
s/VK_SAMPLER_ADDRESS_MODE_MIRROR_ONCE\b/VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE/g
s/VK_SAMPLER_ADDRESS_MODE_CLAMP_BORDER\b/VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER/g

https://gitlab.khronos.org/vulkan/vulkan/merge_requests/542

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 68fde35..be5d1b5 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1178,9 +1178,9 @@
             .magFilter = VK_FILTER_NEAREST,
             .minFilter = VK_FILTER_NEAREST,
             .mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE,
-            .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP,
-            .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP,
-            .addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP,
+            .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+            .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+            .addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
             .mipLodBias = 0.0f,
             .maxAnisotropy = 1,
             .compareOp = VK_COMPARE_OP_NEVER,
@@ -1332,8 +1332,6 @@
 {
     const VkAttachmentDescription attachments[2] = {
         [0] = {
-            .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
-            .pNext = NULL,
             .format = demo->format,
             .samples = 1,
             .loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR,
@@ -1344,8 +1342,6 @@
             .finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
         },
         [1] = {
-            .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
-            .pNext = NULL,
             .format = demo->depth.format,
             .samples = 1,
             .loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR,
@@ -1360,9 +1356,11 @@
         .attachment = 0,
         .layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
     };
+    const VkAttachmentReference depth_reference = {
+        .attachment = 1,
+        .layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+    };
     const VkSubpassDescription subpass = {
-        .sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION,
-        .pNext = NULL,
         .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
         .flags = 0,
         .inputAttachmentCount = 0,
@@ -1370,10 +1368,7 @@
         .colorAttachmentCount = 1,
         .pColorAttachments = &color_reference,
         .pResolveAttachments = NULL,
-        .depthStencilAttachment = {
-            .attachment = 1,
-            .layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-        },
+        .pDepthStencilAttachment = &depth_reference,
         .preserveAttachmentCount = 0,
         .pPreserveAttachments = NULL,
     };
@@ -1587,7 +1582,7 @@
     memset(&rs, 0, sizeof(rs));
     rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
     rs.fillMode = VK_FILL_MODE_SOLID;
-    rs.cullMode = VK_CULL_MODE_BACK;
+    rs.cullMode = VK_CULL_MODE_BACK_BIT;
     rs.frontFace = VK_FRONT_FACE_CCW;
     rs.depthClampEnable = VK_FALSE;
     rs.rasterizerDiscardEnable = VK_FALSE;