vk: Pull the VkResult enum from revision 130
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 23:15:12 +0000 (16:15 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 23:15:12 +0000 (16:15 -0700)
include/vulkan/vulkan.h

index a60b83e7d7a832454082a52aea1c270772af1124..196f582e75aa2b827568b8cc17959f7be70111bb 100644 (file)
@@ -118,53 +118,49 @@ VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable)
 // ------------------------------------------------------------------------------------------------
 // Enumerations
 
-typedef enum VkResult_
-{
-    // Return codes for successful operation execution (> = 0)
-    VK_SUCCESS                                              = 0x0000000,
-    VK_UNSUPPORTED                                          = 0x0000001,
-    VK_NOT_READY                                            = 0x0000002,
-    VK_TIMEOUT                                              = 0x0000003,
-    VK_EVENT_SET                                            = 0x0000004,
-    VK_EVENT_RESET                                          = 0x0000005,
-
-    // Error codes (negative values)
-    VK_ERROR_UNKNOWN                                        = -(0x00000001),
-    VK_ERROR_UNAVAILABLE                                    = -(0x00000002),
-    VK_ERROR_INITIALIZATION_FAILED                          = -(0x00000003),
-    VK_ERROR_OUT_OF_HOST_MEMORY                             = -(0x00000004),
-    VK_ERROR_OUT_OF_DEVICE_MEMORY                           = -(0x00000005),
-    VK_ERROR_DEVICE_ALREADY_CREATED                         = -(0x00000006),
-    VK_ERROR_DEVICE_LOST                                    = -(0x00000007),
-    VK_ERROR_INVALID_POINTER                                = -(0x00000008),
-    VK_ERROR_INVALID_VALUE                                  = -(0x00000009),
-    VK_ERROR_INVALID_HANDLE                                 = -(0x0000000A),
-    VK_ERROR_INVALID_ORDINAL                                = -(0x0000000B),
-    VK_ERROR_INVALID_MEMORY_SIZE                            = -(0x0000000C),
-    VK_ERROR_INVALID_EXTENSION                              = -(0x0000000D),
-    VK_ERROR_INVALID_FLAGS                                  = -(0x0000000E),
-    VK_ERROR_INVALID_ALIGNMENT                              = -(0x0000000F),
-    VK_ERROR_INVALID_FORMAT                                 = -(0x00000010),
-    VK_ERROR_INVALID_IMAGE                                  = -(0x00000011),
-    VK_ERROR_INVALID_DESCRIPTOR_SET_DATA                    = -(0x00000012),
-    VK_ERROR_INVALID_QUEUE_TYPE                             = -(0x00000013),
-    VK_ERROR_INVALID_OBJECT_TYPE                            = -(0x00000014),
-    VK_ERROR_UNSUPPORTED_SHADER_IL_VERSION                  = -(0x00000015),
-    VK_ERROR_BAD_SHADER_CODE                                = -(0x00000016),
-    VK_ERROR_BAD_PIPELINE_DATA                              = -(0x00000017),
-    VK_ERROR_TOO_MANY_MEMORY_REFERENCES                     = -(0x00000018),
-    VK_ERROR_NOT_MAPPABLE                                   = -(0x00000019),
-    VK_ERROR_MEMORY_MAP_FAILED                              = -(0x0000001A),
-    VK_ERROR_MEMORY_UNMAP_FAILED                            = -(0x0000001B),
-    VK_ERROR_INCOMPATIBLE_DEVICE                            = -(0x0000001C),
-    VK_ERROR_INCOMPATIBLE_DRIVER                            = -(0x0000001D),
-    VK_ERROR_INCOMPLETE_COMMAND_BUFFER                      = -(0x0000001E),
-    VK_ERROR_BUILDING_COMMAND_BUFFER                        = -(0x0000001F),
-    VK_ERROR_MEMORY_NOT_BOUND                               = -(0x00000020),
-    VK_ERROR_INCOMPATIBLE_QUEUE                             = -(0x00000021),
-    VK_ERROR_NOT_SHAREABLE                                  = -(0x00000022),
-
-    VK_MAX_ENUM(RESULT)
+typedef enum {
+    VK_SUCCESS = 0,
+    VK_UNSUPPORTED = 1,
+    VK_NOT_READY = 2,
+    VK_TIMEOUT = 3,
+    VK_EVENT_SET = 4,
+    VK_EVENT_RESET = 5,
+    VK_ERROR_UNKNOWN = -1,
+    VK_ERROR_UNAVAILABLE = -2,
+    VK_ERROR_INITIALIZATION_FAILED = -3,
+    VK_ERROR_OUT_OF_HOST_MEMORY = -4,
+    VK_ERROR_OUT_OF_DEVICE_MEMORY = -5,
+    VK_ERROR_DEVICE_ALREADY_CREATED = -6,
+    VK_ERROR_DEVICE_LOST = -7,
+    VK_ERROR_INVALID_POINTER = -8,
+    VK_ERROR_INVALID_VALUE = -9,
+    VK_ERROR_INVALID_HANDLE = -10,
+    VK_ERROR_INVALID_ORDINAL = -11,
+    VK_ERROR_INVALID_MEMORY_SIZE = -12,
+    VK_ERROR_INVALID_EXTENSION = -13,
+    VK_ERROR_INVALID_FLAGS = -14,
+    VK_ERROR_INVALID_ALIGNMENT = -15,
+    VK_ERROR_INVALID_FORMAT = -16,
+    VK_ERROR_INVALID_IMAGE = -17,
+    VK_ERROR_INVALID_DESCRIPTOR_SET_DATA = -18,
+    VK_ERROR_INVALID_QUEUE_TYPE = -19,
+    VK_ERROR_INVALID_OBJECT_TYPE = -20,
+    VK_ERROR_UNSUPPORTED_SHADER_IL_VERSION = -21,
+    VK_ERROR_BAD_SHADER_CODE = -22,
+    VK_ERROR_BAD_PIPELINE_DATA = -23,
+    VK_ERROR_NOT_MAPPABLE = -24,
+    VK_ERROR_MEMORY_MAP_FAILED = -25,
+    VK_ERROR_MEMORY_UNMAP_FAILED = -26,
+    VK_ERROR_INCOMPATIBLE_DEVICE = -27,
+    VK_ERROR_INCOMPATIBLE_DRIVER = -28,
+    VK_ERROR_INCOMPLETE_COMMAND_BUFFER = -29,
+    VK_ERROR_BUILDING_COMMAND_BUFFER = -30,
+    VK_ERROR_MEMORY_NOT_BOUND = -31,
+    VK_ERROR_INCOMPATIBLE_QUEUE = -32,
+    VK_RESULT_BEGIN_RANGE = VK_ERROR_INCOMPATIBLE_QUEUE,
+    VK_RESULT_END_RANGE = VK_EVENT_RESET,
+    VK_RESULT_NUM = (VK_EVENT_RESET - VK_ERROR_INCOMPATIBLE_QUEUE + 1),
+    VK_RESULT_MAX_ENUM = 0x7FFFFFFF
 } VkResult;
 
 // Structure type enumerant