Add VK_REMAINING_* defines to vulkan framework

Change-Id: I4d4693bab868cdf904d2b4c706fdb954f282ab13

diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
index f349538..92aba86 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@ -11,6 +11,8 @@
 #define VK_ATTACHMENT_UNUSED                           (static_cast<deUint32>                  ((~0U)))
 #define VK_SUBPASS_EXTERNAL                                    (static_cast<deUint32>                  ((~0U)))
 #define VK_QUEUE_FAMILY_IGNORED                                (static_cast<deUint32>                  ((~0U)))
+#define VK_REMAINING_MIP_LEVELS                                (static_cast<deUint32>                  ((~0U)))
+#define VK_REMAINING_ARRAY_LAYERS                      (static_cast<deUint32>                  ((~0U)))
 #define VK_WHOLE_SIZE                                          (static_cast<vk::VkDeviceSize>  ((~0ULL)))
 #define VK_TRUE                                                                (static_cast<vk::VkBool32>              (1))
 #define VK_FALSE                                                       (static_cast<vk::VkBool32>              (0))

diff --git a/external/vulkancts/gen_framework.py b/external/vulkancts/gen_framework.py
index da0a2be..c690a83 100644 (file)
--- a/external/vulkancts/gen_framework.py
+++ b/external/vulkancts/gen_framework.py
@@ -118,6 +118,8 @@ DEFINITIONS                 = [
        ("VK_ATTACHMENT_UNUSED",                                "deUint32"),
        ("VK_SUBPASS_EXTERNAL",                                 "deUint32"),
        ("VK_QUEUE_FAMILY_IGNORED",                             "deUint32"),
+       ("VK_REMAINING_MIP_LEVELS",                             "deUint32"),
+       ("VK_REMAINING_ARRAY_LAYERS",                   "deUint32"),
        ("VK_WHOLE_SIZE",                                               "vk::VkDeviceSize"),
        ("VK_TRUE",                                                             "vk::VkBool32"),
        ("VK_FALSE",                                                    "vk::VkBool32"),