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

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index d265265..2463c09 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2897,9 +2897,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
@@ -2994,9 +2994,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
@@ -3091,9 +3091,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
@@ -3188,9 +3188,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
@@ -3359,9 +3359,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
@@ -3465,9 +3465,9 @@
         sampler_ci.magFilter = VK_FILTER_NEAREST;
         sampler_ci.minFilter = VK_FILTER_NEAREST;
         sampler_ci.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
-        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP;
-        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP;
+        sampler_ci.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        sampler_ci.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
         sampler_ci.mipLodBias = 1.0;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;