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

10 files changed, 77 insertions, 77 deletions

diff --git a/demos/cube.c b/demos/cube.c
index 2880cf9b..4c1cc319 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1175,12 +1175,12 @@ static void demo_prepare_textures(struct demo *demo)
         const VkSamplerCreateInfo sampler = {
             .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
             .pNext = NULL,
-            .magFilter = VK_TEX_FILTER_NEAREST,
-            .minFilter = VK_TEX_FILTER_NEAREST,
-            .mipMode = VK_TEX_MIPMAP_MODE_BASE,
-            .addressModeU = VK_TEX_ADDRESS_MODE_CLAMP,
-            .addressModeV = VK_TEX_ADDRESS_MODE_CLAMP,
-            .addressModeW = VK_TEX_ADDRESS_MODE_CLAMP,
+            .magFilter = VK_FILTER_NEAREST,
+            .minFilter = VK_FILTER_NEAREST,
+            .mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE,
+            .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP,
+            .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP,
+            .addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP,
             .mipLodBias = 0.0f,
             .maxAnisotropy = 1,
             .compareOp = VK_COMPARE_OP_NEVER,
diff --git a/demos/tri.c b/demos/tri.c
index bd4f8eb2..8e76659c 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -934,12 +934,12 @@ static void demo_prepare_textures(struct demo *demo)
         const VkSamplerCreateInfo sampler = {
             .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
             .pNext = NULL,
-            .magFilter = VK_TEX_FILTER_NEAREST,
-            .minFilter = VK_TEX_FILTER_NEAREST,
-            .mipMode = VK_TEX_MIPMAP_MODE_BASE,
-            .addressModeU = VK_TEX_ADDRESS_MODE_WRAP,
-            .addressModeV = VK_TEX_ADDRESS_MODE_WRAP,
-            .addressModeW = VK_TEX_ADDRESS_MODE_WRAP,
+            .magFilter = VK_FILTER_NEAREST,
+            .minFilter = VK_FILTER_NEAREST,
+            .mipmapMode = VK_SAMPLER_MIPMAP_MODE_BASE,
+            .addressModeU = VK_SAMPLER_ADDRESS_MODE_WRAP,
+            .addressModeV = VK_SAMPLER_ADDRESS_MODE_WRAP,
+            .addressModeW = VK_SAMPLER_ADDRESS_MODE_WRAP,
             .mipLodBias = 0.0f,
             .maxAnisotropy = 1,
             .compareOp = VK_COMPARE_OP_NEVER,
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index a0e175a1..9cb75d8d 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -905,7 +905,7 @@ ICD_EXPORT void VKAPI vkCmdBlitImage(
     VkImageLayout                            destImageLayout,
     uint32_t                                 regionCount,
     const VkImageBlit*                       pRegions,
-    VkTexFilter                              filter)
+    VkFilter                                 filter)
 {
     NULLDRV_LOG_FUNC;
 }
diff --git a/include/vulkan.h b/include/vulkan.h
index 073cb6ac..4f0574f6 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -647,35 +647,35 @@ typedef enum {
 } VkDynamicState;
 
 typedef enum {
-    VK_TEX_FILTER_NEAREST = 0,
-    VK_TEX_FILTER_LINEAR = 1,
-    VK_TEX_FILTER_BEGIN_RANGE = VK_TEX_FILTER_NEAREST,
-    VK_TEX_FILTER_END_RANGE = VK_TEX_FILTER_LINEAR,
-    VK_TEX_FILTER_NUM = (VK_TEX_FILTER_LINEAR - VK_TEX_FILTER_NEAREST + 1),
-    VK_TEX_FILTER_MAX_ENUM = 0x7FFFFFFF
-} VkTexFilter;
-
-typedef enum {
-    VK_TEX_MIPMAP_MODE_BASE = 0,
-    VK_TEX_MIPMAP_MODE_NEAREST = 1,
-    VK_TEX_MIPMAP_MODE_LINEAR = 2,
-    VK_TEX_MIPMAP_MODE_BEGIN_RANGE = VK_TEX_MIPMAP_MODE_BASE,
-    VK_TEX_MIPMAP_MODE_END_RANGE = VK_TEX_MIPMAP_MODE_LINEAR,
-    VK_TEX_MIPMAP_MODE_NUM = (VK_TEX_MIPMAP_MODE_LINEAR - VK_TEX_MIPMAP_MODE_BASE + 1),
-    VK_TEX_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
-} VkTexMipmapMode;
-
-typedef enum {
-    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_MODE_BEGIN_RANGE = VK_TEX_ADDRESS_MODE_WRAP,
-    VK_TEX_ADDRESS_MODE_END_RANGE = VK_TEX_ADDRESS_MODE_CLAMP_BORDER,
-    VK_TEX_ADDRESS_MODE_NUM = (VK_TEX_ADDRESS_MODE_CLAMP_BORDER - VK_TEX_ADDRESS_MODE_WRAP + 1),
-    VK_TEX_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
-} VkTexAddressMode;
+    VK_FILTER_NEAREST = 0,
+    VK_FILTER_LINEAR = 1,
+    VK_FILTER_BEGIN_RANGE = VK_FILTER_NEAREST,
+    VK_FILTER_END_RANGE = VK_FILTER_LINEAR,
+    VK_FILTER_NUM = (VK_FILTER_LINEAR - VK_FILTER_NEAREST + 1),
+    VK_FILTER_MAX_ENUM = 0x7FFFFFFF
+} VkFilter;
+
+typedef enum {
+    VK_SAMPLER_MIPMAP_MODE_BASE = 0,
+    VK_SAMPLER_MIPMAP_MODE_NEAREST = 1,
+    VK_SAMPLER_MIPMAP_MODE_LINEAR = 2,
+    VK_SAMPLER_MIPMAP_MODE_BEGIN_RANGE = VK_SAMPLER_MIPMAP_MODE_BASE,
+    VK_SAMPLER_MIPMAP_MODE_END_RANGE = VK_SAMPLER_MIPMAP_MODE_LINEAR,
+    VK_SAMPLER_MIPMAP_MODE_NUM = (VK_SAMPLER_MIPMAP_MODE_LINEAR - VK_SAMPLER_MIPMAP_MODE_BASE + 1),
+    VK_SAMPLER_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
+} VkSamplerMipmapMode;
+
+typedef enum {
+    VK_SAMPLER_ADDRESS_MODE_WRAP = 0,
+    VK_SAMPLER_ADDRESS_MODE_MIRROR = 1,
+    VK_SAMPLER_ADDRESS_MODE_CLAMP = 2,
+    VK_SAMPLER_ADDRESS_MODE_MIRROR_ONCE = 3,
+    VK_SAMPLER_ADDRESS_MODE_CLAMP_BORDER = 4,
+    VK_SAMPLER_ADDRESS_MODE_BEGIN_RANGE = VK_SAMPLER_ADDRESS_MODE_WRAP,
+    VK_SAMPLER_ADDRESS_MODE_END_RANGE = VK_SAMPLER_ADDRESS_MODE_CLAMP_BORDER,
+    VK_SAMPLER_ADDRESS_MODE_NUM = (VK_SAMPLER_ADDRESS_MODE_CLAMP_BORDER - VK_SAMPLER_ADDRESS_MODE_WRAP + 1),
+    VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
+} VkSamplerAddressMode;
 
 typedef enum {
     VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK = 0,
@@ -1756,12 +1756,12 @@ typedef struct {
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
-    VkTexFilter                                 magFilter;
-    VkTexFilter                                 minFilter;
-    VkTexMipmapMode                             mipMode;
-    VkTexAddressMode                            addressModeU;
-    VkTexAddressMode                            addressModeV;
-    VkTexAddressMode                            addressModeW;
+    VkFilter                                    magFilter;
+    VkFilter                                    minFilter;
+    VkSamplerMipmapMode                         mipmapMode;
+    VkSamplerAddressMode                        addressModeU;
+    VkSamplerAddressMode                        addressModeV;
+    VkSamplerAddressMode                        addressModeW;
     float                                       mipLodBias;
     float                                       maxAnisotropy;
     VkBool32                                    compareEnable;
@@ -2194,7 +2194,7 @@ typedef void (VKAPI *PFN_vkCmdDispatch)(VkCmdBuffer cmdBuffer, uint32_t x, uint3
 typedef void (VKAPI *PFN_vkCmdDispatchIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset);
 typedef void (VKAPI *PFN_vkCmdCopyBuffer)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);
 typedef void (VKAPI *PFN_vkCmdCopyImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
-typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkTexFilter filter);
+typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter);
 typedef void (VKAPI *PFN_vkCmdCopyBufferToImage)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);
 typedef void (VKAPI *PFN_vkCmdCopyImageToBuffer)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
 typedef void (VKAPI *PFN_vkCmdUpdateBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData);
@@ -2880,7 +2880,7 @@ void VKAPI vkCmdBlitImage(
     VkImageLayout                               destImageLayout,
     uint32_t                                    regionCount,
     const VkImageBlit*                          pRegions,
-    VkTexFilter                                 filter);
+    VkFilter                                    filter);
 
 void VKAPI vkCmdCopyBufferToImage(
     VkCmdBuffer                                 cmdBuffer,
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index c823e980..c66ff414 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2888,7 +2888,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer,
                                              VkImage srcImage, VkImageLayout srcImageLayout,
                                              VkImage destImage, VkImageLayout destImageLayout,
                                              uint32_t regionCount, const VkImageBlit* pRegions,
-                                             VkTexFilter filter)
+                                             VkFilter filter)
 {
     VkBool32 skipCall = VK_FALSE;
     layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
diff --git a/layers/image.cpp b/layers/image.cpp
index c615109a..af8bef49 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -712,7 +712,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(
     VkImageLayout      destImageLayout,
     uint32_t           regionCount,
     const VkImageBlit *pRegions,
-    VkTexFilter        filter)
+    VkFilter        filter)
 {
     VkBool32    skipCall    = VK_FALSE;
     layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -811,10 +811,10 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(
         // Validate filter
         if (vk_format_is_depth_or_stencil(srcFormat) ||
             vk_format_is_int(srcFormat)) {
-            if (filter != VK_TEX_FILTER_NEAREST) {
+            if (filter != VK_FILTER_NEAREST) {
                 std::stringstream ss;
                 ss << "vkCmdBlitImage: If the format of srcImage is a depth, stencil, depth stencil or integer-based format "
-                   << "then filter must be VK_TEX_FILTER_NEAREST.";
+                   << "then filter must be VK_FILTER_NEAREST.";
                 skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                    (uint64_t)cmdBuffer, 0, IMAGE_INVALID_FILTER, "IMAGE", ss.str().c_str());
             }
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index c9ea4694..644c17d2 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -2087,7 +2087,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(
     VkImageLayout      destImageLayout,
     uint32_t           regionCount,
     const VkImageBlit *pRegions,
-    VkTexFilter        filter)
+    VkFilter        filter)
 {
     layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
     VkDeviceMemory mem;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 638bce53..d407c160 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4347,43 +4347,43 @@ bool PreCreateSampler(
         "vkCreateSampler parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator");
         return false;
     }
-    if(pCreateInfo->magFilter < VK_TEX_FILTER_BEGIN_RANGE ||
-        pCreateInfo->magFilter > VK_TEX_FILTER_END_RANGE)
+    if(pCreateInfo->magFilter < VK_FILTER_BEGIN_RANGE ||
+        pCreateInfo->magFilter > VK_FILTER_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCreateSampler parameter, VkTexFilter pCreateInfo->magFilter, is an unrecognized enumerator");
+        "vkCreateSampler parameter, VkFilter pCreateInfo->magFilter, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->minFilter < VK_TEX_FILTER_BEGIN_RANGE ||
-        pCreateInfo->minFilter > VK_TEX_FILTER_END_RANGE)
+    if(pCreateInfo->minFilter < VK_FILTER_BEGIN_RANGE ||
+        pCreateInfo->minFilter > VK_FILTER_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCreateSampler parameter, VkTexFilter pCreateInfo->minFilter, is an unrecognized enumerator");
+        "vkCreateSampler parameter, VkFilter pCreateInfo->minFilter, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->mipMode < VK_TEX_MIPMAP_MODE_BEGIN_RANGE ||
-        pCreateInfo->mipMode > VK_TEX_MIPMAP_MODE_END_RANGE)
+    if(pCreateInfo->mipmapMode < VK_SAMPLER_MIPMAP_MODE_BEGIN_RANGE ||
+        pCreateInfo->mipmapMode > VK_SAMPLER_MIPMAP_MODE_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCreateSampler parameter, VkTexMipmapMode pCreateInfo->mipMode, is an unrecognized enumerator");
+        "vkCreateSampler parameter, VkSamplerMipmapMode pCreateInfo->mipmapMode, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->addressModeU < VK_TEX_ADDRESS_MODE_BEGIN_RANGE ||
-        pCreateInfo->addressModeU > VK_TEX_ADDRESS_MODE_END_RANGE)
+    if(pCreateInfo->addressModeU < VK_SAMPLER_ADDRESS_MODE_BEGIN_RANGE ||
+        pCreateInfo->addressModeU > VK_SAMPLER_ADDRESS_MODE_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
         "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeU, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->addressModeV < VK_TEX_ADDRESS_MODE_BEGIN_RANGE ||
-        pCreateInfo->addressModeV > VK_TEX_ADDRESS_MODE_END_RANGE)
+    if(pCreateInfo->addressModeV < VK_SAMPLER_ADDRESS_MODE_BEGIN_RANGE ||
+        pCreateInfo->addressModeV > VK_SAMPLER_ADDRESS_MODE_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
         "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeV, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->addressModeW < VK_TEX_ADDRESS_MODE_BEGIN_RANGE ||
-        pCreateInfo->addressModeW > VK_TEX_ADDRESS_MODE_END_RANGE)
+    if(pCreateInfo->addressModeW < VK_SAMPLER_ADDRESS_MODE_BEGIN_RANGE ||
+        pCreateInfo->addressModeW > VK_SAMPLER_ADDRESS_MODE_END_RANGE)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
         "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeW, is an unrecognized enumerator");
@@ -5754,7 +5754,7 @@ bool PostCmdBlitImage(
     VkImage destImage,
     VkImageLayout destImageLayout,
     uint32_t regionCount,
-    VkTexFilter filter)
+    VkFilter filter)
 {
 
 
@@ -5776,11 +5776,11 @@ bool PostCmdBlitImage(
     }
 
 
-    if(filter < VK_TEX_FILTER_BEGIN_RANGE ||
-        filter > VK_TEX_FILTER_END_RANGE)
+    if(filter < VK_FILTER_BEGIN_RANGE ||
+        filter > VK_FILTER_END_RANGE)
     {
         log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCmdBlitImage parameter, VkTexFilter filter, is an unrecognized enumerator");
+        "vkCmdBlitImage parameter, VkFilter filter, is an unrecognized enumerator");
         return false;
     }
 
@@ -5795,7 +5795,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(
     VkImageLayout destImageLayout,
     uint32_t regionCount,
     const VkImageBlit* pRegions,
-    VkTexFilter filter)
+    VkFilter filter)
 {
     PreCmdBlitImage(cmdBuffer, pRegions);
 
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 219827cc..4613630f 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1258,7 +1258,7 @@ LOADER_EXPORT void VKAPI vkCmdCopyImage(VkCmdBuffer cmdBuffer, VkImage srcImage,
     disp->CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
 }
 
-LOADER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkTexFilter filter)
+LOADER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter)
 {
     const VkLayerDispatchTable *disp;
 
diff --git a/vulkan.py b/vulkan.py
index 3f0c7063..ea7a650b 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -872,7 +872,7 @@ core = Extension(
              Param("VkImageLayout", "destImageLayout"),
              Param("uint32_t", "regionCount"),
              Param("const VkImageBlit*", "pRegions"),
-             Param("VkTexFilter", "filter")]),
+             Param("VkFilter", "filter")]),
 
         Proto("void", "CmdCopyBufferToImage",
             [Param("VkCmdBuffer", "cmdBuffer"),