From c4cc88f40620fb5816a7791a3d47e4954d55ac03 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Thu, 19 Sep 2024 21:37:57 +0200 Subject: [PATCH] dxgi: Add DXGI_OUTDUPL_FLAG enum annotation to DuplicateOutput1() On the side, alphabetically sort some flags and use `--enumMakeFlags` in `emitter.settings.rsp` instead of `--with-attribute XXX=Flags` in `Namespace/settings.rsp`. --- generation/WinSDK/Partitions/Dxgi/settings.rsp | 2 ++ generation/WinSDK/emitter.settings.rsp | 17 ++++++++--------- scripts/ChangesSinceLastRelease.txt | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/generation/WinSDK/Partitions/Dxgi/settings.rsp b/generation/WinSDK/Partitions/Dxgi/settings.rsp index bdbf3289..102230f8 100644 --- a/generation/WinSDK/Partitions/Dxgi/settings.rsp +++ b/generation/WinSDK/Partitions/Dxgi/settings.rsp @@ -14,6 +14,8 @@ _D3DCOLORVALUE --namespace Windows.Win32.Graphics.Dxgi --with-attribute +DXGI_ADAPTER_FLAG=Flags +DXGI_DEBUG_RLO_FLAGS=Flags DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS=Flags DXGI_OFFER_RESOURCE_FLAGS=Flags DXGI_OUTDUPL_FLAG=Flags diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp index 32ea1560..4f29d02e 100644 --- a/generation/WinSDK/emitter.settings.rsp +++ b/generation/WinSDK/emitter.settings.rsp @@ -49,8 +49,6 @@ DELETE_SNAPSHOT_VHDSET_FLAG DEPENDENT_DISK_FLAG DETACH_VIRTUAL_DISK_FLAG DRAWPROGRESSFLAGS -DXGI_ADAPTER_FLAG -DXGI_DEBUG_RLO_FLAGS EXPAND_VIRTUAL_DISK_FLAG FILEOPENDIALOGOPTIONS FORK_VIRTUAL_DISK_FLAG @@ -1829,24 +1827,25 @@ DXGI_ADAPTER_DESC2::Flags=[AssociatedEnum("DXGI_ADAPTER_FLAG")] DXGI_DECODE_SWAP_CHAIN_DESC::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] DXGI_SWAP_CHAIN_DESC::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] DXGI_SWAP_CHAIN_DESC1::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] -IDXGIDevice4::OfferResources1::Flags=[AssociatedEnum("DXGI_OFFER_RESOURCE_FLAGS")] -IDXGIOutput3::CheckOverlaySupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_SUPPORT_FLAG")] -IDXGIOutput4::CheckOverlayColorSpaceSupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG")] -IDXGIOutput6::CheckHardwareCompositionSupport::pFlags=[AssociatedEnum("DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS")] -IDXGISwapChain::ResizeBuffers::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] -IDXGISwapChain3::CheckColorSpaceSupport::pColorSpaceSupport=[AssociatedEnum("DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG")] -IDXGISwapChain3::ResizeBuffers1::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] IDXGIAdapter::GetDesc::pDesc=[RetVal] IDXGIAdapter1::GetDesc1::pDesc=[RetVal] IDXGIAdapter2::GetDesc2::pDesc=[RetVal] IDXGIAdapter4::GetDesc3::pDesc=[RetVal] +IDXGIDevice4::OfferResources1::Flags=[AssociatedEnum("DXGI_OFFER_RESOURCE_FLAGS")] IDXGIOutput::GetDesc::pDesc=[RetVal] +IDXGIOutput3::CheckOverlaySupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_SUPPORT_FLAG")] +IDXGIOutput4::CheckOverlayColorSpaceSupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG")] +IDXGIOutput5::DuplicateOutput1::Flags=[AssociatedEnum("DXGI_OUTDUPL_FLAG")] +IDXGIOutput6::CheckHardwareCompositionSupport::pFlags=[AssociatedEnum("DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS")] IDXGIOutput6::GetDesc1::pDesc=[RetVal] IDXGIOutputDuplication::GetDesc::pDesc=[RetVal] IDXGISurface::GetDesc::pDesc=[RetVal] IDXGISwapChain::GetDesc::pDesc=[RetVal] +IDXGISwapChain::ResizeBuffers::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] IDXGISwapChain1::GetDesc1::pDesc=[RetVal] IDXGISwapChain1::GetFullscreenDesc::pDesc=[RetVal] +IDXGISwapChain3::CheckColorSpaceSupport::pColorSpaceSupport=[AssociatedEnum("DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG")] +IDXGISwapChain3::ResizeBuffers1::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")] LPWPUCLOSEEVENT::hEvent=WSAEVENT LPWPUCREATEEVENT::return=WSAEVENT LPWPURESETEVENT::hEvent=WSAEVENT diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt index fe09a343..74875ed9 100644 --- a/scripts/ChangesSinceLastRelease.txt +++ b/scripts/ChangesSinceLastRelease.txt @@ -2720,3 +2720,5 @@ Windows.Win32.Security.Cryptography.Apis.GetKeyDerivationInterface added Windows.Win32.Security.Cryptography.Apis.GetRngInterface added Windows.Win32.Security.Cryptography.Apis.GetSecretAgreementInterface added Windows.Win32.Security.Cryptography.Apis.GetSignatureInterface added +# dxgi: Add DXGI_OUTDUPL_FLAG enum annotation to DuplicateOutput1() +Windows.Win32.Graphics.Dxgi.IDXGIOutput5.DuplicateOutput1 : Flags : [In] => [AssociatedEnum(DXGI_OUTDUPL_FLAG),In]