[PATCH 0/6] MR10030: Add symbols in d3d12.idl and d3d12sdklayers.idl for pcsx2
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 93184c7a4c6..d3d4fc1893a 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5040,6 +5040,23 @@ interface ID3D12SDKConfiguration : IUnknown HRESULT SetSDKVersion(UINT version, const char *path); } +[ + uuid(8aaf9303-ad25-48b9-9a57-d9c37e009d9f), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration1 : ID3D12SDKConfiguration +{ + HRESULT CreateDeviceFactory( + [in] UINT sdk_version, + [in] const char *sdk_path, + [in] REFIID riid, + [out] void **ppv); + + void FreeUnusedSDKs(); +} + typedef enum D3D12_AXIS_SHADING_RATE { D3D12_AXIS_SHADING_RATE_1X = 0x0, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index d3d4fc1893a..8877d585271 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5057,6 +5057,46 @@ interface ID3D12SDKConfiguration1 : ID3D12SDKConfiguration void FreeUnusedSDKs(); } +typedef enum D3D12_DEVICE_FACTORY_FLAGS +{ + D3D12_DEVICE_FACTORY_FLAG_NONE = 0, + D3D12_DEVICE_FACTORY_FLAG_ALLOW_RETURNING_EXISTING_DEVICE = 0x1, + D3D12_DEVICE_FACTORY_FLAG_ALLOW_RETURNING_INCOMPATIBLE_EXISTING_DEVICE = 0x2, + D3D12_DEVICE_FACTORY_FLAG_DISALLOW_STORING_NEW_DEVICE_AS_SINGLETON = 0x4, +} D3D12_DEVICE_FACTORY_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEVICE_FACTORY_FLAGS)") + +[ + uuid(61f307d3-d34e-4e7c-8374-3ba4de23cccb), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceFactory : IUnknown +{ + HRESULT InitializeFromGlobalState(); + HRESULT ApplyToGlobalState(); + HRESULT SetFlags(D3D12_DEVICE_FACTORY_FLAGS flags); + D3D12_DEVICE_FACTORY_FLAGS GetFlags(); + + HRESULT GetConfigurationInterface( + [in] REFCLSID clsid, + [in] REFIID iid, + [out] void **ppv); + + HRESULT EnableExperimentalFeatures( + [in] UINT num_features, + [in] const IID *iids, + [in] void *configuration_structs, + [in] UINT *configuration_struct_sizes); + + HRESULT CreateDevice( + [in, optional] IUnknown *adapter, + [in] D3D_FEATURE_LEVEL feature_level, + [in] REFIID riid, + [out] void **ppv_device); +} + typedef enum D3D12_AXIS_SHADING_RATE { D3D12_AXIS_SHADING_RATE_1X = 0x0, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 8877d585271..205a699ecf6 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5097,6 +5097,56 @@ interface ID3D12DeviceFactory : IUnknown [out] void **ppv_device); } +typedef enum D3D12_DEVICE_FLAGS +{ + D3D12_DEVICE_FLAG_NONE = 0, + D3D12_DEVICE_FLAG_DEBUG_LAYER_ENABLED = 0x1, + D3D12_DEVICE_FLAG_GPU_BASED_VALIDATION_ENABLED = 0x2, + D3D12_DEVICE_FLAG_SYNCHRONIZED_COMMAND_QUEUE_VALIDATION_DISABLED = 0x4, + D3D12_DEVICE_FLAG_DRED_AUTO_BREADCRUMBS_ENABLED = 0x8, + D3D12_DEVICE_FLAG_DRED_PAGE_FAULT_REPORTING_ENABLED = 0x10, + D3D12_DEVICE_FLAG_DRED_WATSON_REPORTING_ENABLED = 0x20, + D3D12_DEVICE_FLAG_DRED_BREADCRUMB_CONTEXT_ENABLED = 0x40, + D3D12_DEVICE_FLAG_DRED_USE_MARKERS_ONLY_BREADCRUMBS = 0x80, + D3D12_DEVICE_FLAG_SHADER_INSTRUMENTATION_ENABLED = 0x100, + D3D12_DEVICE_FLAG_AUTO_DEBUG_NAME_ENABLED = 0x200, + D3D12_DEVICE_FLAG_FORCE_LEGACY_STATE_VALIDATION = 0x400, +} D3D12_DEVICE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEVICE_FLAGS)") + +typedef struct D3D12_DEVICE_CONFIGURATION_DESC +{ + D3D12_DEVICE_FLAGS Flags; + UINT GpuBasedValidationFlags; + UINT SDKVersion; + UINT NumEnabledExperimentalFeatures; +} D3D12_DEVICE_CONFIGURATION_DESC; + +[ + uuid(78dbf87b-f766-422b-a61c-c8c446bdb9ad), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceConfiguration : IUnknown +{ + D3D12_DEVICE_CONFIGURATION_DESC GetDesc(); + HRESULT GetEnabledExperimentalFeatures( + [out] GUID *guids, + [in] UINT num_guids); + + HRESULT SerializeVersionedRootSignature( + [in] const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + [out] ID3DBlob **result, + [out, optional] ID3DBlob **error); + + HRESULT CreateVersionedRootSignatureDeserializer( + [in] const void *blob, + [in] SIZE_T size, + [in] REFIID riid, + [out] void **deserializer); +} + typedef enum D3D12_AXIS_SHADING_RATE { D3D12_AXIS_SHADING_RATE_1X = 0x0, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d12.idl b/include/d3d12.idl index 205a699ecf6..58f293efda8 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -4767,7 +4767,7 @@ typedef enum D3D12_BARRIER_SYNC D3D12_BARRIER_SYNC_NONE = 0x0, D3D12_BARRIER_SYNC_ALL = 0x1, D3D12_BARRIER_SYNC_DRAW = 0x2, - D3D12_BARRIER_SYNC_INPUT_ASSEMBLER = 0x4, + D3D12_BARRIER_SYNC_INDEX_INPUT = 0x4, D3D12_BARRIER_SYNC_VERTEX_SHADING = 0x8, D3D12_BARRIER_SYNC_PIXEL_SHADING = 0x10, D3D12_BARRIER_SYNC_DEPTH_STENCIL = 0x20, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 58f293efda8..f260743530d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -4781,6 +4781,7 @@ typedef enum D3D12_BARRIER_SYNC D3D12_BARRIER_SYNC_ALL_SHADING = 0x1000, D3D12_BARRIER_SYNC_NON_PIXEL_SHADING = 0x2000, D3D12_BARRIER_SYNC_EMIT_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO = 0x4000, + D3D12_BARRIER_SYNC_CLEAR_UNORDERED_ACCESS_VIEW = 0x8000, D3D12_BARRIER_SYNC_VIDEO_DECODE = 0x100000, D3D12_BARRIER_SYNC_VIDEO_PROCESS = 0x200000, D3D12_BARRIER_SYNC_VIDEO_ENCODE = 0x400000, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
From: Biswapriyo Nath <nathbappai@gmail.com> --- include/d3d12sdklayers.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl index abfd25c6ffa..199cd77ae74 100644 --- a/include/d3d12sdklayers.idl +++ b/include/d3d12sdklayers.idl @@ -891,6 +891,7 @@ typedef enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_UNBOUNDED_STATIC_DESCRIPTORS = 0x04fd, D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_INVALIDSHADERBYTECODE = 0x04fe, D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_OUTOFMEMORY = 0x04ff, + D3D12_MESSAGE_ID_INCOMPATIBLE_BARRIER_LAYOUT = 0x0536, D3D12_MESSAGE_ID_D3D12_MESSAGES_END } D3D12_MESSAGE_ID; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10030
participants (2)
-
Biswapriyo Nath -
Biswapriyo Nath (＠Biswa96)