bug 14541: rename VkTexAddress to VkTexAddressMode

4 files changed, 27 insertions, 27 deletions

diff --git a/demos/cube.c b/demos/cube.c
index 7b52ac70..292b7a84 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1217,9 +1217,9 @@ static void demo_prepare_textures(struct demo *demo)
             .magFilter = VK_TEX_FILTER_NEAREST,
             .minFilter = VK_TEX_FILTER_NEAREST,
             .mipMode = VK_TEX_MIPMAP_MODE_BASE,
-            .addressU = VK_TEX_ADDRESS_CLAMP,
-            .addressV = VK_TEX_ADDRESS_CLAMP,
-            .addressW = VK_TEX_ADDRESS_CLAMP,
+            .addressModeU = VK_TEX_ADDRESS_MODE_CLAMP,
+            .addressModeV = VK_TEX_ADDRESS_MODE_CLAMP,
+            .addressModeW = VK_TEX_ADDRESS_MODE_CLAMP,
             .mipLodBias = 0.0f,
             .maxAnisotropy = 1,
             .compareOp = VK_COMPARE_OP_NEVER,
diff --git a/demos/tri.c b/demos/tri.c
index 21abb264..63bd2741 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -867,9 +867,9 @@ static void demo_prepare_textures(struct demo *demo)
             .magFilter = VK_TEX_FILTER_NEAREST,
             .minFilter = VK_TEX_FILTER_NEAREST,
             .mipMode = VK_TEX_MIPMAP_MODE_BASE,
-            .addressU = VK_TEX_ADDRESS_WRAP,
-            .addressV = VK_TEX_ADDRESS_WRAP,
-            .addressW = VK_TEX_ADDRESS_WRAP,
+            .addressModeU = VK_TEX_ADDRESS_MODE_WRAP,
+            .addressModeV = VK_TEX_ADDRESS_MODE_WRAP,
+            .addressModeW = VK_TEX_ADDRESS_MODE_WRAP,
             .mipLodBias = 0.0f,
             .maxAnisotropy = 1,
             .compareOp = VK_COMPARE_OP_NEVER,
diff --git a/include/vulkan.h b/include/vulkan.h
index bea31ace..67b52412 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -695,16 +695,16 @@ typedef enum {
 } 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 @@ typedef struct {
     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 f943ad39..246b1573 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4612,25 +4612,25 @@ bool PreCreateSampler(
         "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 ||