bug-14532: Rename VK_LAST_* to VK_REMAINING_*
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14532
diff --git a/include/vulkan.h b/include/vulkan.h
index b7464a1..36808ed 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -128,8 +128,8 @@
VK_DEFINE_NONDISP_HANDLE(VkCmdPool)
#define VK_LOD_CLAMP_NONE 1000.0f
-#define VK_LAST_MIP_LEVEL (~0U)
-#define VK_LAST_ARRAY_SLICE (~0U)
+#define VK_REMAINING_MIP_LEVELS (~0U)
+#define VK_REMAINING_ARRAY_SLICES (~0U)
#define VK_WHOLE_SIZE (~0ULL)
#define VK_ATTACHMENT_UNUSED (~0U)
#define VK_TRUE 1
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index fa9927f..2eed8d8 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1356,9 +1356,9 @@
VkImageSubresourceRange srRange = {};
srRange.aspect = VK_IMAGE_ASPECT_COLOR;
srRange.baseMipLevel = 0;
- srRange.mipLevels = VK_LAST_MIP_LEVEL;
+ srRange.mipLevels = VK_REMAINING_MIP_LEVELS;
srRange.baseArraySlice = 0;
- srRange.arraySize = VK_LAST_ARRAY_SLICE;
+ srRange.arraySize = VK_REMAINING_ARRAY_SLICES;
VkImageMemoryBarrier memory_barrier = {};
memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -1388,9 +1388,9 @@
VkImageSubresourceRange dsRange = {};
dsRange.aspect = VK_IMAGE_ASPECT_DEPTH;
dsRange.baseMipLevel = 0;
- dsRange.mipLevels = VK_LAST_MIP_LEVEL;
+ dsRange.mipLevels = VK_REMAINING_MIP_LEVELS;
dsRange.baseArraySlice = 0;
- dsRange.arraySize = VK_LAST_ARRAY_SLICE;
+ dsRange.arraySize = VK_REMAINING_ARRAY_SLICES;
// prepare the depth buffer for clear
@@ -1443,9 +1443,9 @@
VkImageSubresourceRange srRange = {};
srRange.aspect = VK_IMAGE_ASPECT_COLOR;
srRange.baseMipLevel = 0;
- srRange.mipLevels = VK_LAST_MIP_LEVEL;
+ srRange.mipLevels = VK_REMAINING_MIP_LEVELS;
srRange.baseArraySlice = 0;
- srRange.arraySize = VK_LAST_ARRAY_SLICE;
+ srRange.arraySize = VK_REMAINING_ARRAY_SLICES;
VkImageMemoryBarrier memory_barrier = {};
memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;