bug 14541: rename VkTexAddress to VkTexAddressMode
diff --git a/include/vulkan.h b/include/vulkan.h
index bea31ac..67b5241 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -695,16 +695,16 @@
} VkTexMipmapMode;
typedef enum {
- VK_TEX_ADDRESS_WRAP = 0,
- VK_TEX_ADDRESS_MIRROR = 1,
- VK_TEX_ADDRESS_CLAMP = 2,
- VK_TEX_ADDRESS_MIRROR_ONCE = 3,
- VK_TEX_ADDRESS_CLAMP_BORDER = 4,
- VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_WRAP,
- VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_CLAMP_BORDER,
- VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_CLAMP_BORDER - VK_TEX_ADDRESS_WRAP + 1),
+ VK_TEX_ADDRESS_MODE_WRAP = 0,
+ VK_TEX_ADDRESS_MODE_MIRROR = 1,
+ VK_TEX_ADDRESS_MODE_CLAMP = 2,
+ VK_TEX_ADDRESS_MODE_MIRROR_ONCE = 3,
+ VK_TEX_ADDRESS_MODE_CLAMP_BORDER = 4,
+ VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_MODE_WRAP,
+ VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_MODE_CLAMP_BORDER,
+ VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_MODE_CLAMP_BORDER - VK_TEX_ADDRESS_MODE_WRAP + 1),
VK_TEX_ADDRESS_MAX_ENUM = 0x7FFFFFFF
-} VkTexAddress;
+} VkTexAddressMode;
typedef enum {
VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK = 0,
@@ -1739,9 +1739,9 @@
VkTexFilter magFilter;
VkTexFilter minFilter;
VkTexMipmapMode mipMode;
- VkTexAddress addressU;
- VkTexAddress addressV;
- VkTexAddress addressW;
+ VkTexAddressMode addressModeU;
+ VkTexAddressMode addressModeV;
+ VkTexAddressMode addressModeW;
float mipLodBias;
float maxAnisotropy;
VkBool32 compareEnable;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index f943ad3..246b157 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4612,25 +4612,25 @@
"vkCreateSampler parameter, VkTexMipmapMode pCreateInfo->mipMode, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->addressU < VK_TEX_ADDRESS_BEGIN_RANGE ||
- pCreateInfo->addressU > VK_TEX_ADDRESS_END_RANGE)
+ if(pCreateInfo->addressModeU < VK_TEX_ADDRESS_BEGIN_RANGE ||
+ pCreateInfo->addressModeU > VK_TEX_ADDRESS_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressU, is an unrecognized enumerator");
+ "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeU, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->addressV < VK_TEX_ADDRESS_BEGIN_RANGE ||
- pCreateInfo->addressV > VK_TEX_ADDRESS_END_RANGE)
+ if(pCreateInfo->addressModeV < VK_TEX_ADDRESS_BEGIN_RANGE ||
+ pCreateInfo->addressModeV > VK_TEX_ADDRESS_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressV, is an unrecognized enumerator");
+ "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeV, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->addressW < VK_TEX_ADDRESS_BEGIN_RANGE ||
- pCreateInfo->addressW > VK_TEX_ADDRESS_END_RANGE)
+ if(pCreateInfo->addressModeW < VK_TEX_ADDRESS_BEGIN_RANGE ||
+ pCreateInfo->addressModeW > VK_TEX_ADDRESS_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressW, is an unrecognized enumerator");
+ "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeW, is an unrecognized enumerator");
return false;
}
if(pCreateInfo->compareOp < VK_COMPARE_OP_BEGIN_RANGE ||
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 0f5c370..4d78f0d 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1551,9 +1551,9 @@
sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressU = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressV = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressW = VK_TEX_ADDRESS_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -1639,9 +1639,9 @@
sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressU = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressV = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressW = VK_TEX_ADDRESS_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -1726,9 +1726,9 @@
sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressU = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressV = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressW = VK_TEX_ADDRESS_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
@@ -1814,9 +1814,9 @@
sampler_ci.magFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.minFilter = VK_TEX_FILTER_NEAREST;
sampler_ci.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- sampler_ci.addressU = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressV = VK_TEX_ADDRESS_CLAMP;
- sampler_ci.addressW = VK_TEX_ADDRESS_CLAMP;
+ 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.mipLodBias = 1.0;
sampler_ci.maxAnisotropy = 1;
sampler_ci.compareEnable = VK_FALSE;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 54708e2..ff7f0c1 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -897,9 +897,9 @@
samplerCreateInfo.magFilter = VK_TEX_FILTER_NEAREST;
samplerCreateInfo.minFilter = VK_TEX_FILTER_NEAREST;
samplerCreateInfo.mipMode = VK_TEX_MIPMAP_MODE_BASE;
- samplerCreateInfo.addressU = VK_TEX_ADDRESS_WRAP;
- samplerCreateInfo.addressV = VK_TEX_ADDRESS_WRAP;
- samplerCreateInfo.addressW = VK_TEX_ADDRESS_WRAP;
+ samplerCreateInfo.addressModeU = VK_TEX_ADDRESS_MODE_WRAP;
+ samplerCreateInfo.addressModeV = VK_TEX_ADDRESS_MODE_WRAP;
+ samplerCreateInfo.addressModeW = VK_TEX_ADDRESS_MODE_WRAP;
samplerCreateInfo.mipLodBias = 0.0;
samplerCreateInfo.maxAnisotropy = 0;
samplerCreateInfo.compareOp = VK_COMPARE_OP_NEVER;