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/include/vulkan.h b/include/vulkan.h
index 073cb6a..4f0574f 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -647,35 +647,35 @@
} 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;
+ 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_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;
+ 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_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_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 {
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_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 @@
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 c823e98..c66ff41 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2888,7 +2888,7 @@
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 c615109..af8bef4 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -712,7 +712,7 @@
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 @@
// 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 c9ea469..644c17d 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -2087,7 +2087,7 @@
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 638bce5..d407c16 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4347,43 +4347,43 @@
"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 @@
VkImage destImage,
VkImageLayout destImageLayout,
uint32_t regionCount,
- VkTexFilter filter)
+ VkFilter filter)
{
@@ -5776,11 +5776,11 @@
}
- 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 @@
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 219827c..4613630 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1258,7 +1258,7 @@
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/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;
diff --git a/vulkan.py b/vulkan.py
index 3f0c706..ea7a650 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -872,7 +872,7 @@
Param("VkImageLayout", "destImageLayout"),
Param("uint32_t", "regionCount"),
Param("const VkImageBlit*", "pRegions"),
- Param("VkTexFilter", "filter")]),
+ Param("VkFilter", "filter")]),
Proto("void", "CmdCopyBufferToImage",
[Param("VkCmdBuffer", "cmdBuffer"),