diff options
| author | Cody Northrop <cody@lunarg.com> | 2015-08-04 14:34:54 -0600 |
|---|---|---|
| committer | Cody Northrop <cody@lunarg.com> | 2015-08-04 17:37:03 -0600 |
| commit | 011546bc79e6804c16f6bd1a986b6034ea98855e (patch) | |
| tree | e4ea8a9588bd78a3ff4579660c4e96288ea4e34b /include | |
| parent | 837a476ad7b6fc82509701c2b6d8ac9d3e928557 (diff) | |
| download | usermoji-011546bc79e6804c16f6bd1a986b6034ea98855e.tar.xz | |
v146: Bug 14290 - Move typedefs from vk_platform.h to vulkan.h, make pSampleMask an array
Diffstat (limited to 'include')
| -rw-r--r-- | include/vk_platform.h | 6 | ||||
| -rw-r--r-- | include/vulkan.h | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/vk_platform.h b/include/vk_platform.h index 8832097a..db9c4f99 100644 --- a/include/vk_platform.h +++ b/include/vk_platform.h @@ -76,12 +76,6 @@ extern "C" #endif #endif // !defined(VK_NO_STDINT_H) -typedef uint64_t VkDeviceSize; -typedef uint32_t VkBool32; - -typedef uint32_t VkSampleMask; -typedef uint32_t VkFlags; - #if (UINTPTR_MAX >= UINT64_MAX) #define VK_UINTPTRLEAST64_MAX UINTPTR_MAX diff --git a/include/vulkan.h b/include/vulkan.h index ef2a352c..d3509efb 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 145, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 146, 0) #define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj; @@ -837,7 +837,7 @@ typedef enum { VK_RENDER_PASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF } VkRenderPassContents; - +typedef uint32_t VkFlags; typedef enum { VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT = 0x00000001, VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT = 0x00000002, @@ -1125,6 +1125,7 @@ typedef struct { const char*const* ppEnabledExtensionNames; } VkInstanceCreateInfo; +typedef uint32_t VkBool32; typedef struct { VkBool32 robustBufferAccess; VkBool32 fullDrawIndexUint32; @@ -1196,6 +1197,7 @@ typedef struct { uint32_t maxSamples; } VkImageFormatProperties; +typedef uint64_t VkDeviceSize; typedef struct { uint32_t maxImageDimension1D; uint32_t maxImageDimension2D; @@ -1627,13 +1629,14 @@ typedef struct { VkFrontFace frontFace; } VkPipelineRasterStateCreateInfo; +typedef uint32_t VkSampleMask; typedef struct { VkStructureType sType; const void* pNext; uint32_t rasterSamples; VkBool32 sampleShadingEnable; float minSampleShading; - VkSampleMask sampleMask; + const VkSampleMask* pSampleMask; } VkPipelineMultisampleStateCreateInfo; typedef struct { |