commit ddc8db51f37d2d46f925471107db89a710e503e5
author Jon Ashburn <jon@lunarg.com> Mon Dec 14 14:59:20 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Tue Dec 15 08:51:46 2015 -0700
tree e957c14f309daa827e67be3ffb3e61020604381d
parent 118db7cf4c7834a3e0acf29c39702f307313eec6

vulkan: Changes for header version 211

Add anisotropyEnable to VkSamplerCreateInfo.
Add inheritedQueries to VkPhysicalDeviceFeatures

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index f79e58d..f4123e8 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -3421,6 +3421,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;
@@ -3518,6 +3519,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;
@@ -3615,6 +3617,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;
@@ -3712,6 +3715,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;
@@ -3883,6 +3887,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;
@@ -3990,6 +3995,7 @@
         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.anisotropyEnable = VK_FALSE;
         sampler_ci.maxAnisotropy = 1;
         sampler_ci.compareEnable = VK_FALSE;
         sampler_ci.compareOp = VK_COMPARE_OP_NEVER;

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index cb25cb4..469f9ca 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -855,7 +855,8 @@
     samplerCreateInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT;
     samplerCreateInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT;
     samplerCreateInfo.mipLodBias = 0.0;
-    samplerCreateInfo.maxAnisotropy = 0;
+    samplerCreateInfo.anisotropyEnable = VK_FALSE;
+    samplerCreateInfo.maxAnisotropy = 1;
     samplerCreateInfo.compareOp = VK_COMPARE_OP_NEVER;
     samplerCreateInfo.minLod = 0.0;
     samplerCreateInfo.maxLod = 0.0;