v146: Bug 14290 - Move typedefs from vk_platform.h to vulkan.h, make pSampleMask...

diff --git a/demos/cube.c b/demos/cube.c
index b6badcb..b7879fd 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1603,7 +1603,7 @@ static void demo_prepare_pipeline(struct demo *demo)
 
     memset(&ms, 0, sizeof(ms));
     ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
-    ms.sampleMask = 1;
+    ms.pSampleMask = NULL;
     ms.rasterSamples = 1;
 
     // Two stages: vs and fs

diff --git a/demos/tri.c b/demos/tri.c
index f94687c..412b43c 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1242,7 +1242,7 @@ static void demo_prepare_pipeline(struct demo *demo)
 
     memset(&ms, 0, sizeof(ms));
     ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
-    ms.sampleMask = 1;
+    ms.pSampleMask = NULL;
     ms.rasterSamples = 1;
 
     // Two stages: vs and fs

diff --git a/include/vk_platform.h b/include/vk_platform.h
index 8832097..db9c4f9 100644 (file)
--- 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 ef2a352..d3509ef 100644 (file)
--- 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 {