mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Update DXVA2 patches, remove last work-in-progress part.
This commit is contained in:
Sebastian Lackner
parent
2f449562d1
commit
09bfdcb009
@ -1,12 +1,12 @@
|
||||
From fea79238dba89c6233b58cbb86b3702f91f5be24 Mon Sep 17 00:00:00 2001
|
||||
From fceaf9739a92377afc2834e0ce9d9a187f06a2e9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Mar 2014 21:09:24 +0100
|
||||
Subject: include: Add dxva2api.idl
|
||||
|
||||
---
|
||||
include/Makefile.in | 1 +
|
||||
include/dxva2api.idl | 461 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 462 insertions(+)
|
||||
include/dxva2api.idl | 503 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 504 insertions(+)
|
||||
create mode 100644 include/dxva2api.idl
|
||||
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
@ -23,10 +23,10 @@ index ebdc96b..d6997db 100644
|
||||
fusion.idl \
|
||||
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
|
||||
new file mode 100644
|
||||
index 0000000..274cccf
|
||||
index 0000000..c11f90d
|
||||
--- /dev/null
|
||||
+++ b/include/dxva2api.idl
|
||||
@@ -0,0 +1,461 @@
|
||||
@@ -0,0 +1,503 @@
|
||||
+/*
|
||||
+ * Copyright Michael Müller for Pipelight
|
||||
+ *
|
||||
@ -56,6 +56,47 @@ index 0000000..274cccf
|
||||
+typedef DWORD D3DPOOL;
|
||||
+cpp_quote("#endif")
|
||||
+
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0,0x4563, 0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
|
||||
+
|
||||
+/* alternate names */
|
||||
+cpp_quote("#define DXVA2_ModeMPEG2_MOCOMP DXVA2_ModeMPEG2_MoComp")
|
||||
+
|
||||
+cpp_quote("#define DXVA2_ModeWMV8_PostProc DXVA2_ModeWMV8_A")
|
||||
+cpp_quote("#define DXVA2_ModeWMV8_MoComp DXVA2_ModeWMV8_B")
|
||||
+
|
||||
+cpp_quote("#define DXVA2_ModeWMV9_PostProc DXVA2_ModeWMV9_A")
|
||||
+cpp_quote("#define DXVA2_ModeWMV9_MoComp DXVA2_ModeWMV9_B")
|
||||
+cpp_quote("#define DXVA2_ModeWMV9_IDCT DXVA2_ModeWMV9_C")
|
||||
+
|
||||
+cpp_quote("#define DXVA2_ModeVC1_PostProc DXVA2_ModeVC1_A")
|
||||
+cpp_quote("#define DXVA2_ModeVC1_MoComp DXVA2_ModeVC1_B")
|
||||
+cpp_quote("#define DXVA2_ModeVC1_IDCT DXVA2_ModeVC1_C")
|
||||
+cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D")
|
||||
+
|
||||
+cpp_quote("#define DXVA2_ModeH264_MoComp_NoFGT DXVA2_ModeH264_A")
|
||||
+cpp_quote("#define DXVA2_ModeH264_MoComp_FGT DXVA2_ModeH264_B")
|
||||
+cpp_quote("#define DXVA2_ModeH264_IDCT_NoFGT DXVA2_ModeH264_C")
|
||||
+cpp_quote("#define DXVA2_ModeH264_IDCT_FGT DXVA2_ModeH264_D")
|
||||
+cpp_quote("#define DXVA2_ModeH264_VLD_NoFGT DXVA2_ModeH264_E")
|
||||
+cpp_quote("#define DXVA2_ModeH264_VLD_FGT DXVA2_ModeH264_F")
|
||||
+
|
||||
+typedef LONGLONG REFERENCE_TIME;
|
||||
+
|
||||
+enum
|
||||
@ -325,20 +366,6 @@ index 0000000..274cccf
|
||||
+]
|
||||
+interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService
|
||||
+{
|
||||
+ HRESULT CreateVideoDecoder(
|
||||
+ [in] REFGUID guid,
|
||||
+ [in] const DXVA2_VideoDesc *pVideoDesc,
|
||||
+ [in] DXVA2_ConfigPictureDecode *pConfig,
|
||||
+ [in] IDirect3DSurface9 **ppDecoderRenderTargets,
|
||||
+ [in] UINT NumSurfaces,
|
||||
+ [out] IDirectXVideoDecoder **ppDecode);
|
||||
+
|
||||
+ HRESULT GetDecoderConfigurations(
|
||||
+ [in] REFGUID guid,
|
||||
+ [in] const DXVA2_VideoDesc *pVideoDesc,
|
||||
+ [in] IUnknown *pReserved,
|
||||
+ [out] UINT *pCount,
|
||||
+ [out] DXVA2_ConfigPictureDecode **ppConfigs);
|
||||
+
|
||||
+ HRESULT GetDecoderDeviceGuids(
|
||||
+ [out] UINT *count,
|
||||
@ -348,6 +375,21 @@ index 0000000..274cccf
|
||||
+ [in] REFGUID guid,
|
||||
+ [out] UINT *pCount,
|
||||
+ [out] D3DFORMAT **pFormats);
|
||||
+
|
||||
+ HRESULT GetDecoderConfigurations(
|
||||
+ [in] REFGUID guid,
|
||||
+ [in] const DXVA2_VideoDesc *pVideoDesc,
|
||||
+ [in] IUnknown *pReserved,
|
||||
+ [out] UINT *pCount,
|
||||
+ [out] DXVA2_ConfigPictureDecode **ppConfigs);
|
||||
+
|
||||
+ HRESULT CreateVideoDecoder(
|
||||
+ [in] REFGUID guid,
|
||||
+ [in] const DXVA2_VideoDesc *pVideoDesc,
|
||||
+ [in] DXVA2_ConfigPictureDecode *pConfig,
|
||||
+ [in] IDirect3DSurface9 **ppDecoderRenderTargets,
|
||||
+ [in] UINT NumSurfaces,
|
||||
+ [out] IDirectXVideoDecoder **ppDecode);
|
||||
+};
|
||||
+
|
||||
+/*****************************************************************************
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e9681f3d80f1900071d56a5a008424453f39a304 Mon Sep 17 00:00:00 2001
|
||||
From 807e66d582215c2335b39ea2a35bc0abe2cf64dd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Mar 2014 05:20:09 +0100
|
||||
Subject: include: Add PhysicalMonitorEnumerationAPI.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1e3a30b0fac3c5a9d8283f404334ade4e4f44104 Mon Sep 17 00:00:00 2001
|
||||
From 49c89bb58a132a3b34bb40c6eae04d82e5d75978 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Mar 2014 05:24:03 +0100
|
||||
Subject: include: Add LowLevelMonitorConfigurationAPI.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 505fa26a6bf60858f35c45982fefcba41cd27d5a Mon Sep 17 00:00:00 2001
|
||||
From 55f15ed3d397d9220a6b5435ce98c007e0d5514f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Mar 2014 05:26:25 +0100
|
||||
Subject: include: Add HighLevelMonitorConfigurationAPI.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1c3379da1c8615f03acce7c441b3d511245212eb Mon Sep 17 00:00:00 2001
|
||||
From 79288605ddeb6dda4e1b039cd611ba23e60cf178 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Mar 2014 05:32:36 +0100
|
||||
Subject: dxva2: Add implementation for stub functions
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
Revision: 2
|
||||
Revision: 3
|
||||
Author: Michael Müller
|
||||
Title: Added DXVA2 stub implementation.
|
||||
|
||||
@ -57,7 +57,7 @@ index a273502..5fa0cd5 100644
|
||||
+ { "4cd13e94-7f2d-11e3-b5eb-0090f5c75ad5:1", "Erich E. Hoover", "Support for junction points/reparse points." },
|
||||
+ { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." },
|
||||
+ { "3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5:1", "Erich E. Hoover", "Implement missing fonts expected by Silverlight." },
|
||||
+ { "39ca2373-65c1-4d01-8ba0-1c2007cbbc59:2", "Michael Müller", "Added DXVA2 stub implementation." },
|
||||
+ { "39ca2373-65c1-4d01-8ba0-1c2007cbbc59:3", "Michael Müller", "Added DXVA2 stub implementation." },
|
||||
+ { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." },
|
||||
+ { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." },
|
||||
+ { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user