Updated dxva2-Video_Decoder patchset

Thanks Gabriel Ivăncescu.
This commit is contained in:
Alistair Leslie-Hughes 2020-01-07 08:24:20 +11:00
parent a1bf11e38a
commit 7044b0dc98

View File

@ -1,4 +1,4 @@
From 34fefc056a65053060d7de738087f2527b7ed6bb Mon Sep 17 00:00:00 2001
From 32344f3d3cb10c07b4dc2c5547d2226e293f730b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 10 Feb 2015 16:34:05 +0100
Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
@ -6,15 +6,15 @@ Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
---
dlls/dxva2/Makefile.in | 2 +
dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++
dlls/dxva2/devicemanager.c | 213 +++++++++++++++++++++++++++++++++++++
dlls/dxva2/dxva2_private.h | 21 ++++
dlls/dxva2/main.c | 7 +-
4 files changed, 240 insertions(+), 2 deletions(-)
4 files changed, 241 insertions(+), 2 deletions(-)
create mode 100644 dlls/dxva2/devicemanager.c
create mode 100644 dlls/dxva2/dxva2_private.h
diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
index 44e125e9b5f..5c3e3842d79 100644
index 44e125e9b5..5c3e3842d7 100644
--- a/dlls/dxva2/Makefile.in
+++ b/dlls/dxva2/Makefile.in
@@ -1,6 +1,8 @@
@ -28,10 +28,10 @@ index 44e125e9b5f..5c3e3842d79 100644
main.c
diff --git a/dlls/dxva2/devicemanager.c b/dlls/dxva2/devicemanager.c
new file mode 100644
index 00000000000..15d78aa7ff0
index 0000000000..bba0fbc619
--- /dev/null
+++ b/dlls/dxva2/devicemanager.c
@@ -0,0 +1,212 @@
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2014 Sebastian Lackner for Pipelight
+ *
@ -187,6 +187,7 @@ index 00000000000..15d78aa7ff0
+ FIXME("(%p)->(%p, %p, %d): semi-stub\n", This, hDevice, ppDevice, fBlock);
+
+ *ppDevice = (IDirect3DDevice9 *)hDevice;
+ IDirect3DDevice9_AddRef(*ppDevice);
+ return S_OK;
+}
+
@ -246,7 +247,7 @@ index 00000000000..15d78aa7ff0
+}
diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
new file mode 100644
index 00000000000..d6e59fc6da8
index 0000000000..d6e59fc6da
--- /dev/null
+++ b/dlls/dxva2/dxva2_private.h
@@ -0,0 +1,21 @@
@ -272,7 +273,7 @@ index 00000000000..d6e59fc6da8
+
+extern HRESULT devicemanager_create( UINT *resetToken, void **ppv ) DECLSPEC_HIDDEN;
diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index 782f0dfa3d4..df8f2030104 100644
index 782f0dfa3d..df8f203010 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -19,8 +19,11 @@
@ -300,5 +301,5 @@ index 782f0dfa3d4..df8f2030104 100644
HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv )
--
2.20.1
2.17.1