From cecec4a1dbcd2535e5fe2e78f083e8577ab3f6cb Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Wed, 22 Jun 2016 00:23:06 +0300 Subject: [PATCH] Update Vulkan to 1.0.17 --- .../kotlin/org/lwjgl/vulkan/ValidityProtos.kt | 27 ++++++++++++------- .../org/lwjgl/vulkan/ValidityStructs.kt | 24 ----------------- .../vulkan/templates/EXT_debug_report.kt | 8 +++--- 3 files changed, 21 insertions(+), 38 deletions(-) diff --git a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityProtos.kt b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityProtos.kt index 858b25711d..653840b7dd 100644 --- a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityProtos.kt +++ b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityProtos.kt @@ -226,33 +226,40 @@ val vkCmdBeginRenderPass = """ If any of the {@code initialLayout} or {@code finalLayout} member of the ##VkAttachmentDescription structures or the {@code layout} member of the ##VkAttachmentReference structures specified when creating the render pass specified in the {@code renderPass} member of {@code pRenderPassBegin} - is #IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL then the corresponding attachment image of the framebuffer specified in the {@code framebuffer} member of - {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_COLOR_ATTACHMENT_BIT set + is #IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL then the corresponding attachment image subresource of the framebuffer specified in the + {@code framebuffer} member of {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_COLOR_ATTACHMENT_BIT set """, """ If any of the {@code initialLayout} or {@code finalLayout} member of the ##VkAttachmentDescription structures or the {@code layout} member of the ##VkAttachmentReference structures specified when creating the render pass specified in the {@code renderPass} member of {@code pRenderPassBegin} - is #IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL or #IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL then the corresponding attachment image of the - framebuffer specified in the {@code framebuffer} member of {@code pRenderPassBegin} $must have been created with + is #IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL or #IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL then the corresponding attachment image + subresource of the framebuffer specified in the {@code framebuffer} member of {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT set """, """ If any of the {@code initialLayout} or {@code finalLayout} member of the ##VkAttachmentDescription structures or the {@code layout} member of the ##VkAttachmentReference structures specified when creating the render pass specified in the {@code renderPass} member of {@code pRenderPassBegin} - is #IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL then the corresponding attachment image of the framebuffer specified in the {@code framebuffer} member of - {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_SAMPLED_BIT or #IMAGE_USAGE_INPUT_ATTACHMENT_BIT set + is #IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL then the corresponding attachment image subresource of the framebuffer specified in the + {@code framebuffer} member of {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_SAMPLED_BIT or #IMAGE_USAGE_INPUT_ATTACHMENT_BIT + set """, """ If any of the {@code initialLayout} or {@code finalLayout} member of the ##VkAttachmentDescription structures or the {@code layout} member of the ##VkAttachmentReference structures specified when creating the render pass specified in the {@code renderPass} member of {@code pRenderPassBegin} - is #IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL then the corresponding attachment image of the framebuffer specified in the {@code framebuffer} member of - {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_TRANSFER_SRC_BIT set + is #IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL then the corresponding attachment image subresource of the framebuffer specified in the {@code framebuffer} + member of {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_TRANSFER_SRC_BIT set """, """ If any of the {@code initialLayout} or {@code finalLayout} member of the ##VkAttachmentDescription structures or the {@code layout} member of the ##VkAttachmentReference structures specified when creating the render pass specified in the {@code renderPass} member of {@code pRenderPassBegin} - is #IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL then the corresponding attachment image of the framebuffer specified in the {@code framebuffer} member of - {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_TRANSFER_DST_BIT set + is #IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL then the corresponding attachment image subresource of the framebuffer specified in the {@code framebuffer} + member of {@code pRenderPassBegin} $must have been created with #IMAGE_USAGE_TRANSFER_DST_BIT set + """, + """ + If any of the {@code initialLayout} members of the ##VkAttachmentDescription structures specified when creating the render pass specified in the + {@code renderPass} member of {@code pRenderPassBegin} is not one of #IMAGE_LAYOUT_UNDEFINED or #IMAGE_LAYOUT_PREINITIALIZED, then each such + {@code initialLayout} $must be equal to the current layout of the corresponding attachment image subresource of the framebuffer specified in the + {@code framebuffer} member of {@code pRenderPassBegin}. """ )} diff --git a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityStructs.kt b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityStructs.kt index a4746f13dc..2c8a6b8ca2 100644 --- a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityStructs.kt +++ b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/ValidityStructs.kt @@ -462,18 +462,6 @@ val VkDeviceCreateInfo = """, "If {@code pEnabledFeatures} is not $NULL, {@code pEnabledFeatures} $must be a pointer to a valid ##VkPhysicalDeviceFeatures structure", "{@code queueCreateInfoCount} $must be greater than 0", - """ - {@code ppEnabledLayerNames} $must either be {@code NULL} or contain the same sequence of layer names that was enabled when creating the parent - instance - """, - """ - Any given element of {@code ppEnabledExtensionNames} $must be the name of an extension present on the system, exactly matching a string returned in - the ##VkExtensionProperties structure by #EnumerateDeviceExtensionProperties() - """, - """ - If an extension listed in {@code ppEnabledExtensionNames} is provided as part of a layer, then both the layer and extension $must be enabled to - enable that extension - """, "The {@code queueFamilyIndex} member of any given element of {@code pQueueCreateInfos} $must be unique within {@code pQueueCreateInfos}" )}""" @@ -1322,18 +1310,6 @@ val VkInstanceCreateInfo = """ If {@code enabledExtensionCount} is not 0, {@code ppEnabledExtensionNames} $must be a pointer to an array of {@code enabledExtensionCount} null-terminated strings - """, - """ - Any given element of {@code ppEnabledLayerNames} $must be the name of a layer present on the system, exactly matching a string returned in the - ##VkLayerProperties structure by #EnumerateInstanceLayerProperties() - """, - """ - Any given element of {@code ppEnabledExtensionNames} $must be the name of an extension present on the system, exactly matching a string returned in - the ##VkExtensionProperties structure by #EnumerateInstanceExtensionProperties() - """, - """ - If an extension listed in {@code ppEnabledExtensionNames} is provided as part of a layer, then both the layer and extension $must be enabled to - enable that extension """ )}""" diff --git a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/templates/EXT_debug_report.kt b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/templates/EXT_debug_report.kt index 30f2288725..95e13a2d11 100644 --- a/modules/templates/src/main/kotlin/org/lwjgl/vulkan/templates/EXT_debug_report.kt +++ b/modules/templates/src/main/kotlin/org/lwjgl/vulkan/templates/EXT_debug_report.kt @@ -20,15 +20,15 @@ val EXT_debug_report = "EXTDebugReport".nativeClassVK("EXT_debug_report", postfi the information to a file, others may cause a debug break point or other application defined behavior. An application can register callbacks even when no validation layers are enabled, but they will only be called for loader and, if implemented, driver events. - To capture issues found while creating an instance an application can link a ##VkDebugReportCallbackCreateInfoEXT structure to the {@code pNext} - element of the ##VkInstanceCreateInfo structure given to #CreateInstance(). This callback is only valid for the duration of the - {@code vkCreateInstance} call. Use #CreateDebugReportCallbackEXT() to create persistent callback objects. + To capture issues found while creating or destroying an instance an application can link a ##VkDebugReportCallbackCreateInfoEXT structure to the + {@code pNext} element of the ##VkInstanceCreateInfo structure given to #CreateInstance(). This callback is only valid for the duration of the + #CreateInstance() and the #DestroyInstance() call. Use #CreateDebugReportCallbackEXT() to create persistent callback objects. """ IntConstant( "The extension specification version.", - "EXT_DEBUG_REPORT_SPEC_VERSION".."2" + "EXT_DEBUG_REPORT_SPEC_VERSION".."3" ) StringConstant(