From 2e11cade51d0a0f08aa4f55d9fb96a33b40726fb Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 4 Aug 2015 10:47:08 -0600 Subject: v142: Bug 14275 - Remove image layouts in VkFramebufferCreateInfo --- include/vulkan.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/vulkan.h b/include/vulkan.h index 36d8b2cc..33ccde74 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,14 +41,14 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 140, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 142, 0) #define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj; #if defined(__cplusplus) - #if (_MSC_VER >= 1800 || __cplusplus >= 201103L) + #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || __cplusplus >= 201103L) // The bool operator only works if there are no implicit conversions from an obj to // a bool-compatible type, which can then be used to unintentionally violate type safety. // C++11 and above supports the "explicit" keyword on conversion operators to stop this @@ -1859,17 +1859,12 @@ typedef struct { uint32_t stencilBackRef; } VkDynamicDepthStencilStateCreateInfo; -typedef struct { - VkAttachmentView view; - VkImageLayout layout; -} VkAttachmentBindInfo; - typedef struct { VkStructureType sType; const void* pNext; VkRenderPass renderPass; uint32_t attachmentCount; - const VkAttachmentBindInfo* pAttachments; + const VkAttachmentView* pAttachments; uint32_t width; uint32_t height; uint32_t layers; -- cgit v1.2.3