KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan.h: Move stuff around 

This has no functional change but substantially decreases the diff with the
0.170.2 header.
This commit is contained in:
Jason Ekstrand 2015-10-06 09:50:01 -07:00
parent d1908d2c33
commit ba2254aa79
1 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
include/vulkan/vulkan.h
View File

@ -76,20 +76,6 @@ extern "C" {
#define VK_LOD_CLAMP_NONE MAX_FLOAT
#define VK_LAST_MIP_LEVEL UINT32_MAX
#define VK_LAST_ARRAY_SLICE UINT32_MAX
#define VK_WHOLE_SIZE UINT64_MAX
#define VK_ATTACHMENT_UNUSED UINT32_MAX
#define VK_TRUE 1
#define VK_FALSE 0
#define VK_NULL_HANDLE 0
#define VK_MAX_PHYSICAL_DEVICE_NAME 256
#define VK_UUID_LENGTH 16
#define VK_MAX_MEMORY_TYPES 32
#define VK_MAX_MEMORY_HEAPS 16
#define VK_MAX_EXTENSION_NAME 256
#define VK_MAX_DESCRIPTION 256
VK_DEFINE_HANDLE(VkInstance)
VK_DEFINE_HANDLE(VkPhysicalDevice)
@ -123,6 +109,21 @@ VK_DEFINE_NONDISP_HANDLE(VkDynamicDepthStencilState)
VK_DEFINE_NONDISP_HANDLE(VkFramebuffer)
VK_DEFINE_NONDISP_HANDLE(VkCmdPool)
#define VK_LOD_CLAMP_NONE MAX_FLOAT
#define VK_LAST_MIP_LEVEL UINT32_MAX
#define VK_LAST_ARRAY_SLICE UINT32_MAX
#define VK_WHOLE_SIZE UINT64_MAX
#define VK_ATTACHMENT_UNUSED UINT32_MAX
#define VK_TRUE 1
#define VK_FALSE 0
#define VK_NULL_HANDLE 0
#define VK_MAX_PHYSICAL_DEVICE_NAME 256
#define VK_UUID_LENGTH 16
#define VK_MAX_MEMORY_TYPES 32
#define VK_MAX_MEMORY_HEAPS 16
#define VK_MAX_EXTENSION_NAME 256
#define VK_MAX_DESCRIPTION 256
typedef enum {
VK_SUCCESS = 0,
@ -480,6 +481,21 @@ typedef enum {
VK_SHARING_MODE_MAX_ENUM = 0x7FFFFFFF
} VkSharingMode;
typedef enum {
VK_IMAGE_LAYOUT_UNDEFINED = 0,
VK_IMAGE_LAYOUT_GENERAL = 1,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL = 2,
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL = 3,
VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL = 4,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL = 5,
VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL = 6,
VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL = 7,
VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
VK_IMAGE_LAYOUT_NUM = (VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL - VK_IMAGE_LAYOUT_UNDEFINED + 1),
VK_IMAGE_LAYOUT_MAX_ENUM = 0x7FFFFFFF
} VkImageLayout;
typedef enum {
VK_IMAGE_VIEW_TYPE_1D = 0,
VK_IMAGE_VIEW_TYPE_2D = 1,
@ -748,21 +764,6 @@ typedef enum {
VK_DESCRIPTOR_SET_USAGE_MAX_ENUM = 0x7FFFFFFF
} VkDescriptorSetUsage;
typedef enum {
VK_IMAGE_LAYOUT_UNDEFINED = 0,
VK_IMAGE_LAYOUT_GENERAL = 1,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL = 2,
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL = 3,
VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL = 4,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL = 5,
VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL = 6,
VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL = 7,
VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
VK_IMAGE_LAYOUT_NUM = (VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL - VK_IMAGE_LAYOUT_UNDEFINED + 1),
VK_IMAGE_LAYOUT_MAX_ENUM = 0x7FFFFFFF
} VkImageLayout;
typedef enum {
VK_ATTACHMENT_LOAD_OP_LOAD = 0,
VK_ATTACHMENT_LOAD_OP_CLEAR = 1,
@ -855,6 +856,16 @@ typedef enum {
} VkImageUsageFlagBits;
typedef VkFlags VkImageUsageFlags;
typedef enum {
VK_IMAGE_CREATE_SPARSE_BIT = 0x00000001,
VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT = 0x00000002,
VK_IMAGE_CREATE_SPARSE_ALIASED_BIT = 0x00000004,
VK_IMAGE_CREATE_INVARIANT_DATA_BIT = 0x00000008,
VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000010,
VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000020,
} VkImageCreateFlagBits;
typedef VkFlags VkImageCreateFlags;
typedef enum {
VK_QUEUE_GRAPHICS_BIT = 0x00000001,
VK_QUEUE_COMPUTE_BIT = 0x00000002,
@ -944,14 +955,12 @@ typedef enum {
typedef VkFlags VkBufferCreateFlags;
typedef enum {
VK_IMAGE_CREATE_SPARSE_BIT = 0x00000001,
VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT = 0x00000002,
VK_IMAGE_CREATE_SPARSE_ALIASED_BIT = 0x00000004,
VK_IMAGE_CREATE_INVARIANT_DATA_BIT = 0x00000008,
VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000010,
VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000020,
} VkImageCreateFlagBits;
typedef VkFlags VkImageCreateFlags;
VK_IMAGE_ASPECT_COLOR_BIT = 0x00000001,
VK_IMAGE_ASPECT_DEPTH_BIT = 0x00000002,
VK_IMAGE_ASPECT_STENCIL_BIT = 0x00000004,
VK_IMAGE_ASPECT_METADATA_BIT = 0x00000008,
} VkImageAspectFlagBits;
typedef VkFlags VkImageAspectFlags;
typedef enum {
VK_ATTACHMENT_VIEW_CREATE_READ_ONLY_DEPTH_BIT = 0x00000001,
@ -1062,14 +1071,6 @@ typedef enum {
} VkCmdBufferResetFlagBits;
typedef VkFlags VkCmdBufferResetFlags;
typedef enum {
VK_IMAGE_ASPECT_COLOR_BIT = 0x00000001,
VK_IMAGE_ASPECT_DEPTH_BIT = 0x00000002,
VK_IMAGE_ASPECT_STENCIL_BIT = 0x00000004,
VK_IMAGE_ASPECT_METADATA_BIT = 0x00000008,
} VkImageAspectFlagBits;
typedef VkFlags VkImageAspectFlags;
typedef enum {
VK_QUERY_CONTROL_CONSERVATIVE_BIT = 0x00000001,
} VkQueryControlFlagBits;
@ -1180,6 +1181,12 @@ typedef struct {
VkFormatFeatureFlags optimalTilingFeatures;
} VkFormatProperties;
typedef struct {
int32_t width;
int32_t height;
int32_t depth;
} VkExtent3D;
typedef struct {
uint64_t maxResourceSize;
uint32_t maxSamples;
@ -1365,12 +1372,6 @@ typedef struct {
uint32_t memoryTypeBits;
} VkMemoryRequirements;
typedef struct {
int32_t width;
int32_t height;
int32_t depth;
} VkExtent3D;
typedef struct {
VkImageAspect aspect;
VkExtent3D imageGranularity;
@ -1600,6 +1601,30 @@ typedef struct {
uint32_t patchControlPoints;
} VkPipelineTessellationStateCreateInfo;
typedef struct {
float originX;
float originY;
float width;
float height;
float minDepth;
float maxDepth;
} VkViewport;
typedef struct {
int32_t x;
int32_t y;
} VkOffset2D;
typedef struct {
int32_t width;
int32_t height;
} VkExtent2D;
typedef struct {
VkOffset2D offset;
VkExtent2D extent;
} VkRect2D;
typedef struct {
VkStructureType sType;
const void* pNext;
@ -1787,30 +1812,6 @@ typedef struct {
uint32_t count;
} VkCopyDescriptorSet;
typedef struct {
float originX;
float originY;
float width;
float height;
float minDepth;
float maxDepth;
} VkViewport;
typedef struct {
int32_t x;
int32_t y;
} VkOffset2D;
typedef struct {
int32_t width;
int32_t height;
} VkExtent2D;
typedef struct {
VkOffset2D offset;
VkExtent2D extent;
} VkRect2D;
typedef struct {
VkStructureType sType;
const void* pNext;
@ -1979,6 +1980,11 @@ typedef union {
uint32_t u32[4];
} VkClearColorValue;
typedef struct {
float depth;
uint32_t stencil;
} VkClearDepthStencilValue;
typedef struct {
VkOffset3D offset;
VkExtent3D extent;
@ -1992,11 +1998,6 @@ typedef struct {
VkExtent3D extent;
} VkImageResolve;
typedef struct {
float depth;
uint32_t stencil;
} VkClearDepthStencilValue;
typedef union {
VkClearColorValue color;
VkClearDepthStencilValue depthStencil;