bug 14543: rename VkTex* enums to VkTexture* similarly for VK_TEX_* to VK_TEXTURE_* (WIP)
s/VK_TEX_FILTER_/VK_FILTER_/g
s/VkTexFilter/VkFilter/g
s/VK_TEX_MIPMAP_MODE_/VK_SAMPLER_MIPMAP_MODE_/g
s/VkTexMipmapMode/VkSamplerMipmapMode/g
s/VK_TEX_ADDRESS_MODE_/VK_SAMPLER_ADDRESS_MODE_/g
s/VkTexAddressMode/VkSamplerAddressMode/g
s/mipMode/mipmapMode/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14543
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 81d77f8..76705fe 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2894,12 +2894,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -2991,12 +2991,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -3088,12 +3088,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -3185,12 +3185,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -3356,12 +3356,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -3462,12 +3462,12 @@
VkSamplerCreateInfo sampler_ci = {};
sampler_ci.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_ci.pNext = NULL;
- sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
- sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressModeU = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeV = VK_TEX_ADDRESS_MODE_CLAMP;
- sampler_ci.addressModeW = VK_TEX_ADDRESS_MODE_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 2963b86..b9cc5a5 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -853,12 +853,12 @@
VkSamplerCreateInfo samplerCreateInfo;
memset(&samplerCreateInfo,0,sizeof(samplerCreateInfo));
samplerCreateInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
- samplerCreateInfo.magFilter = VK_TEX_FILTER_NEAREST;
- samplerCreateInfo.minFilter = VK_TEX_FILTER_NEAREST;
- samplerCreateInfo.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- samplerCreateInfo.addressModeU = VK_TEX_ADDRESS_MODE_WRAP;
- samplerCreateInfo.addressModeV = VK_TEX_ADDRESS_MODE_WRAP;
- samplerCreateInfo.addressModeW = VK_TEX_ADDRESS_MODE_WRAP;
+ samplerCreateInfo.magFilter = VK_FILTER_NEAREST;
+ samplerCreateInfo.minFilter = VK_FILTER_NEAREST;
+ samplerCreateInfo.mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE;
+ samplerCreateInfo.addressModeU = VK_SAMPLER_ADDRESS_MODE_WRAP;
+ samplerCreateInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_WRAP;
+ samplerCreateInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_WRAP;
samplerCreateInfo.mipLodBias = 0.0;
samplerCreateInfo.maxAnisotropy = 0;
samplerCreateInfo.compareOp = VK_COMPARE_OP_NEVER;