Skip to content

Commit

Permalink
Merge pull request #491 from expipiplus1/bump3
Browse files Browse the repository at this point in the history
Update Vulkan to v1.3.269
  • Loading branch information
expipiplus1 authored Oct 21, 2023
2 parents 57ce4eb + 147eb2d commit 2007a6e
Show file tree
Hide file tree
Showing 64 changed files with 7,949 additions and 2,383 deletions.
1 change: 1 addition & 0 deletions .github/workflows/bump-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

- id: creds
name: Set up credentials
run: |
# Escape newlines
DEPLOY_KEY="${DEPLOY_KEY//'%'/'%25'}"
Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## WIP

## [3.26.1] - 2023-10-21
- Bump API version to v1.3.269

## [3.26] - 2023-10-17
- Bump API version to v1.3.268
- A breaking change is that `VkBufferMemoryBarrier` has extensions,
Expand Down
2 changes: 1 addition & 1 deletion generate-new/Vulkan-Docs
Submodule Vulkan-Docs updated 53 files
+39 −0 ChangeLog.adoc
+1 −1 Makefile
+38 −0 appendices/VK_ARM_scheduling_controls.adoc
+2 −2 appendices/VK_EXT_device_address_binding_report.adoc
+1 −1 appendices/VK_EXT_extended_dynamic_state.adoc
+1 −1 appendices/VK_EXT_extended_dynamic_state3.adoc
+2 −2 appendices/VK_EXT_external_memory_acquire_unmodified.adoc
+1 −1 appendices/VK_EXT_shader_tile_image.adoc
+2 −25 appendices/VK_KHR_buffer_device_address.adoc
+3 −3 appendices/VK_KHR_depth_stencil_resolve.adoc
+4 −4 appendices/VK_KHR_multiview.adoc
+67 −0 appendices/VK_NV_cuda_kernel_launch.adoc
+39 −39 appendices/roadmap/Roadmap-2022.adoc
+9 −9 appendices/spirvenv.adoc
+4 −19 chapters/VK_EXT_blend_operation_advanced/advanced_blend.adoc
+4 −20 chapters/VK_NV_clip_space_w_scaling/vertexpostproc.adoc
+243 −0 chapters/VK_NV_cuda_kernel_launch/dispatch.adoc
+240 −0 chapters/VK_NV_cuda_kernel_launch/module.adoc
+8 −8 chapters/VK_NV_device_generated_commands/indirectcommands.adoc
+6 −6 chapters/VK_NV_low_latency2/low_latency2.adoc
+4 −0 chapters/VK_NV_memory_decompression.adoc
+6 −6 chapters/accelstructures.adoc
+0 −2 chapters/clears.adoc
+3 −3 chapters/cmdbuffers.adoc
+10 −12 chapters/commonvalidity/blit_image_common.adoc
+4 −5 chapters/commonvalidity/copy_anyimage_to_imageany_common.adoc
+248 −107 chapters/commonvalidity/draw_common.adoc
+2 −2 chapters/commonvalidity/draw_dispatch_common.adoc
+96 −60 chapters/commonvalidity/draw_vertex_binding.adoc
+19 −0 chapters/commonvalidity/dynamic_state2_optional_feature_common.adoc
+18 −0 chapters/commonvalidity/dynamic_state3_feature_common.adoc
+10 −12 chapters/commonvalidity/resolve_image_common.adoc
+6 −6 chapters/copies.adoc
+145 −312 chapters/descriptorsets.adoc
+111 −9 chapters/devsandqueues.adoc
+4 −0 chapters/dispatch.adoc
+44 −0 chapters/features.adoc
+11 −7 chapters/formats.adoc
+42 −210 chapters/fragops.adoc
+20 −98 chapters/framebuffer.adoc
+4 −4 chapters/initialization.adoc
+18 −18 chapters/interfaces.adoc
+26 −1 chapters/limits.adoc
+6 −11 chapters/pipelines.adoc
+36 −180 chapters/primsrast.adoc
+31 −45 chapters/queries.adoc
+125 −209 chapters/renderpass.adoc
+5 −0 chapters/resources.adoc
+29 −31 chapters/shaders.adoc
+4 −20 chapters/tessellation.adoc
+20 −20 chapters/textures.adoc
+20 −97 chapters/vertexpostproc.adoc
+137 −8 xml/vk.xml
4 changes: 2 additions & 2 deletions generate-new/src/Bespoke.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1282,8 +1282,8 @@ cuLaunchSchemes =
a | "pExtras" <- name a -> Just (Vector NotNullable VoidPtr)
_ -> Nothing
"VkCudaLaunchInfoNV" -> \case
a | "pParams" <- name a -> Just (Vector Nullable VoidPtr)
a | "pExtras" <- name a -> Just (Vector Nullable VoidPtr)
a | "pParams" <- name a -> Just (Vector NotNullable VoidPtr)
a | "pExtras" <- name a -> Just (Vector NotNullable VoidPtr)
_ -> Nothing
_ -> const Nothing

Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: vulkan
version: "3.26"
version: "3.26.1"
synopsis: Bindings to the Vulkan graphics API.
description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
category: Graphics
Expand Down
26 changes: 26 additions & 0 deletions src/Vulkan/CStruct/Extends.hs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_opacity_micromap (CopyMicromapToM
import {-# SOURCE #-} Vulkan.Extensions.VK_NVX_binary_import (CuFunctionCreateInfoNVX)
import {-# SOURCE #-} Vulkan.Extensions.VK_NVX_binary_import (CuLaunchInfoNVX)
import {-# SOURCE #-} Vulkan.Extensions.VK_NVX_binary_import (CuModuleCreateInfoNVX)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_cuda_kernel_launch (CudaFunctionCreateInfoNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_cuda_kernel_launch (CudaLaunchInfoNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_cuda_kernel_launch (CudaModuleCreateInfoNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_KHR_external_semaphore_win32 (D3D12FenceSubmitInfoKHR)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_debug_marker (DebugMarkerMarkerInfoEXT)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_debug_marker (DebugMarkerObjectNameInfoEXT)
Expand Down Expand Up @@ -236,6 +239,7 @@ import {-# SOURCE #-} Vulkan.Core13.Promoted_From_VK_EXT_private_data (DevicePri
import {-# SOURCE #-} Vulkan.Core10.Device (DeviceQueueCreateInfo)
import {-# SOURCE #-} Vulkan.Extensions.VK_KHR_global_priority (DeviceQueueGlobalPriorityCreateInfoKHR)
import {-# SOURCE #-} Vulkan.Core11.Originally_Based_On_VK_KHR_protected_memory (DeviceQueueInfo2)
import {-# SOURCE #-} Vulkan.Extensions.VK_ARM_scheduling_controls (DeviceQueueShaderCoreControlCreateInfoARM)
import {-# SOURCE #-} Vulkan.Extensions.VK_LUNARG_direct_driver_loading (DirectDriverLoadingInfoLUNARG)
import {-# SOURCE #-} Vulkan.Extensions.VK_LUNARG_direct_driver_loading (DirectDriverLoadingListLUNARG)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_directfb_surface (DirectFBSurfaceCreateInfoEXT)
Expand Down Expand Up @@ -489,6 +493,8 @@ import {-# SOURCE #-} Vulkan.Extensions.VK_NV_corner_sampled_image (PhysicalDevi
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_coverage_reduction_mode (PhysicalDeviceCoverageReductionModeFeaturesNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_QCOM_filter_cubic_clamp (PhysicalDeviceCubicClampFeaturesQCOM)
import {-# SOURCE #-} Vulkan.Extensions.VK_QCOM_filter_cubic_weights (PhysicalDeviceCubicWeightsFeaturesQCOM)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_cuda_kernel_launch (PhysicalDeviceCudaKernelLaunchFeaturesNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_cuda_kernel_launch (PhysicalDeviceCudaKernelLaunchPropertiesNV)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_custom_border_color (PhysicalDeviceCustomBorderColorFeaturesEXT)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_custom_border_color (PhysicalDeviceCustomBorderColorPropertiesEXT)
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_dedicated_allocation_image_aliasing (PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV)
Expand Down Expand Up @@ -660,6 +666,8 @@ import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_sample_locations (PhysicalDeviceS
import {-# SOURCE #-} Vulkan.Core12.Promoted_From_VK_EXT_sampler_filter_minmax (PhysicalDeviceSamplerFilterMinmaxProperties)
import {-# SOURCE #-} Vulkan.Core11.Promoted_From_VK_KHR_sampler_ycbcr_conversion (PhysicalDeviceSamplerYcbcrConversionFeatures)
import {-# SOURCE #-} Vulkan.Core12.Promoted_From_VK_EXT_scalar_block_layout (PhysicalDeviceScalarBlockLayoutFeatures)
import {-# SOURCE #-} Vulkan.Extensions.VK_ARM_scheduling_controls (PhysicalDeviceSchedulingControlsFeaturesARM)
import {-# SOURCE #-} Vulkan.Extensions.VK_ARM_scheduling_controls (PhysicalDeviceSchedulingControlsPropertiesARM)
import {-# SOURCE #-} Vulkan.Core12.Promoted_From_VK_KHR_separate_depth_stencil_layouts (PhysicalDeviceSeparateDepthStencilLayoutsFeatures)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_shader_atomic_float2 (PhysicalDeviceShaderAtomicFloat2FeaturesEXT)
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_shader_atomic_float (PhysicalDeviceShaderAtomicFloatFeaturesEXT)
Expand Down Expand Up @@ -1296,7 +1304,11 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
Extends DeviceCreateInfo PhysicalDeviceImageProcessing2FeaturesQCOM = ()
Extends DeviceCreateInfo PhysicalDeviceDescriptorPoolOverallocationFeaturesNV = ()
Extends DeviceCreateInfo PhysicalDeviceExternalFormatResolveFeaturesANDROID = ()
Extends DeviceCreateInfo PhysicalDeviceCudaKernelLaunchFeaturesNV = ()
Extends DeviceCreateInfo DeviceQueueShaderCoreControlCreateInfoARM = ()
Extends DeviceCreateInfo PhysicalDeviceSchedulingControlsFeaturesARM = ()
Extends DeviceQueueCreateInfo DeviceQueueGlobalPriorityCreateInfoKHR = ()
Extends DeviceQueueCreateInfo DeviceQueueShaderCoreControlCreateInfoARM = ()
Extends EventCreateInfo ExportMetalObjectCreateInfoEXT = ()
Extends EventCreateInfo ImportMetalSharedEventInfoEXT = ()
Extends ExecutionGraphPipelineCreateInfoAMDX PipelineCreationFeedbackCreateInfo = ()
Expand Down Expand Up @@ -1566,6 +1578,8 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
Extends PhysicalDeviceFeatures2 PhysicalDeviceImageProcessing2FeaturesQCOM = ()
Extends PhysicalDeviceFeatures2 PhysicalDeviceDescriptorPoolOverallocationFeaturesNV = ()
Extends PhysicalDeviceFeatures2 PhysicalDeviceExternalFormatResolveFeaturesANDROID = ()
Extends PhysicalDeviceFeatures2 PhysicalDeviceCudaKernelLaunchFeaturesNV = ()
Extends PhysicalDeviceFeatures2 PhysicalDeviceSchedulingControlsFeaturesARM = ()
Extends PhysicalDeviceImageFormatInfo2 PhysicalDeviceExternalImageFormatInfo = ()
Extends PhysicalDeviceImageFormatInfo2 ImageFormatListCreateInfo = ()
Extends PhysicalDeviceImageFormatInfo2 PhysicalDeviceImageDrmFormatModifierInfoEXT = ()
Expand Down Expand Up @@ -1657,6 +1671,8 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
Extends PhysicalDeviceProperties2 PhysicalDeviceImageProcessing2PropertiesQCOM = ()
Extends PhysicalDeviceProperties2 PhysicalDeviceLayeredDriverPropertiesMSFT = ()
Extends PhysicalDeviceProperties2 PhysicalDeviceExternalFormatResolvePropertiesANDROID = ()
Extends PhysicalDeviceProperties2 PhysicalDeviceCudaKernelLaunchPropertiesNV = ()
Extends PhysicalDeviceProperties2 PhysicalDeviceSchedulingControlsPropertiesARM = ()
Extends PhysicalDeviceSurfaceInfo2KHR SurfaceFullScreenExclusiveInfoEXT = ()
Extends PhysicalDeviceSurfaceInfo2KHR SurfaceFullScreenExclusiveWin32InfoEXT = ()
Extends PhysicalDeviceSurfaceInfo2KHR SurfacePresentModeEXT = ()
Expand Down Expand Up @@ -2378,6 +2394,11 @@ peekChainHead ty p c = case ty of
STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV -> go @LatencySubmissionPresentIdNV
STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV -> go @SwapchainLatencyCreateInfoNV
STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV -> go @LatencySurfaceCapabilitiesNV
STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV -> go @PhysicalDeviceCudaKernelLaunchFeaturesNV
STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV -> go @PhysicalDeviceCudaKernelLaunchPropertiesNV
STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM -> go @DeviceQueueShaderCoreControlCreateInfoARM
STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM -> go @PhysicalDeviceSchedulingControlsFeaturesARM
STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM -> go @PhysicalDeviceSchedulingControlsPropertiesARM
t -> throwIO $ IOError Nothing InvalidArgument "peekChainHead" ("Unrecognized struct type: " <> show t) Nothing Nothing
where
go :: forall e . (Typeable e, FromCStruct e, ToCStruct e, Show e) => IO b
Expand Down Expand Up @@ -2917,6 +2938,11 @@ infix 6 ::&
{-# complete (::&) :: LatencySubmissionPresentIdNV #-}
{-# complete (::&) :: SwapchainLatencyCreateInfoNV #-}
{-# complete (::&) :: LatencySurfaceCapabilitiesNV #-}
{-# complete (::&) :: PhysicalDeviceCudaKernelLaunchFeaturesNV #-}
{-# complete (::&) :: PhysicalDeviceCudaKernelLaunchPropertiesNV #-}
{-# complete (::&) :: DeviceQueueShaderCoreControlCreateInfoARM #-}
{-# complete (::&) :: PhysicalDeviceSchedulingControlsFeaturesARM #-}
{-# complete (::&) :: PhysicalDeviceSchedulingControlsPropertiesARM #-}

-- | View the head and tail of a 'Chain', see '::&'
--
Expand Down
4 changes: 4 additions & 0 deletions src/Vulkan/Core10/AllocationCallbacks.hs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ import Vulkan.Core10.FuncPointers (PFN_vkReallocationFunction)
-- 'Vulkan.Core10.Pipeline.createComputePipelines',
-- 'Vulkan.Extensions.VK_NVX_binary_import.createCuFunctionNVX',
-- 'Vulkan.Extensions.VK_NVX_binary_import.createCuModuleNVX',
-- 'Vulkan.Extensions.VK_NV_cuda_kernel_launch.createCudaFunctionNV',
-- 'Vulkan.Extensions.VK_NV_cuda_kernel_launch.createCudaModuleNV',
-- 'Vulkan.Extensions.VK_EXT_debug_report.createDebugReportCallbackEXT',
-- 'Vulkan.Extensions.VK_EXT_debug_utils.createDebugUtilsMessengerEXT',
-- 'Vulkan.Extensions.VK_KHR_deferred_host_operations.createDeferredOperationKHR',
Expand Down Expand Up @@ -155,6 +157,8 @@ import Vulkan.Core10.FuncPointers (PFN_vkReallocationFunction)
-- 'Vulkan.Core10.CommandPool.destroyCommandPool',
-- 'Vulkan.Extensions.VK_NVX_binary_import.destroyCuFunctionNVX',
-- 'Vulkan.Extensions.VK_NVX_binary_import.destroyCuModuleNVX',
-- 'Vulkan.Extensions.VK_NV_cuda_kernel_launch.destroyCudaFunctionNV',
-- 'Vulkan.Extensions.VK_NV_cuda_kernel_launch.destroyCudaModuleNV',
-- 'Vulkan.Extensions.VK_EXT_debug_report.destroyDebugReportCallbackEXT',
-- 'Vulkan.Extensions.VK_EXT_debug_utils.destroyDebugUtilsMessengerEXT',
-- 'Vulkan.Extensions.VK_KHR_deferred_host_operations.destroyDeferredOperationKHR',
Expand Down
Loading

0 comments on commit 2007a6e

Please sign in to comment.