wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated dxva2-Video_Decoder patchset

Browse Source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48497
This commit is contained in:
Alistair Leslie-Hughes 2020-01-23 12:06:13 +11:00
parent b1e9ef0294
commit 00f288b12e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
patches/dxva2-Video_Decoder/0009-dxva2-Add-DRM-mode-for-vaapi.patch
View File

@ -1,20 +1,20 @@
From aaacd6fc291e406f81a4739ae7f7828937a215a5 Mon Sep 17 00:00:00 2001
From 84b8c115d10082aff224d56bebc3fbd63c0b6377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 4 Mar 2015 03:57:29 +0100
Subject: dxva2: Add DRM mode for vaapi.
Subject: [PATCH] dxva2: Add DRM mode for vaapi.
---
configure.ac | 9 ++---
dlls/dxva2/dxva2_private.h | 7 +++-
dlls/dxva2/main.c | 8 +++++
dlls/dxva2/vaapi.c | 89 +++++++++++++++++++++++++++++++++++++---------
configure.ac | 9 ++--
dlls/dxva2/dxva2_private.h | 7 ++-
dlls/dxva2/main.c | 8 ++++
dlls/dxva2/vaapi.c | 89 ++++++++++++++++++++++++++++++--------
4 files changed, 91 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index c925f6b..bdacada 100644
index 2d60234b02..7a93b20ca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1264,17 +1264,18 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
@@ -1297,17 +1297,18 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
OpenGL and Direct3D won't be supported.])
dnl **** Check for libva ****
@ -38,7 +38,7 @@ index c925f6b..bdacada 100644
CPPFLAGS="$ac_save_CPPFLAGS"
diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
index 5df59bd..14ac586 100644
index 5df59bd3f0..14ac586240 100644
--- a/dlls/dxva2/dxva2_private.h
+++ b/dlls/dxva2/dxva2_private.h
@@ -22,6 +22,7 @@
@ -53,8 +53,8 @@ index 5df59bd..14ac586 100644
/* public */
extern BOOL config_vaapi_enabled DECLSPEC_HIDDEN;
+BOOL config_vaapi_drm DECLSPEC_HIDDEN;
+char config_vaapi_drm_path[MAX_PATH] DECLSPEC_HIDDEN;
+extern BOOL config_vaapi_drm DECLSPEC_HIDDEN;
+extern char config_vaapi_drm_path[MAX_PATH] DECLSPEC_HIDDEN;
extern IWineVideoService *vaapi_videoservice_create( void ) DECLSPEC_HIDDEN;
/* internal */
@ -74,7 +74,7 @@ index 5df59bd..14ac586 100644
static inline WineVideoServiceImpl *impl_from_IWineVideoService( IWineVideoService *iface )
diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index 758c146..0442c63 100644
index 3006f175b7..9da3995f78 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -33,6 +33,8 @@
@ -86,7 +86,7 @@ index 758c146..0442c63 100644
BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length )
{
@@ -379,6 +381,12 @@ static void dxva2_init( void )
@@ -378,6 +380,12 @@ static void dxva2_init( void )
if (get_config_key(defkey, appkey, "backend", buffer, sizeof(buffer)))
config_vaapi_enabled = !strcmp(buffer, "va");
@ -100,7 +100,7 @@ index 758c146..0442c63 100644
if (appkey) RegCloseKey(appkey);
}
diff --git a/dlls/dxva2/vaapi.c b/dlls/dxva2/vaapi.c
index 4c570f5..1b19684 100644
index 4c570f5b94..1b19684053 100644
--- a/dlls/dxva2/vaapi.c
+++ b/dlls/dxva2/vaapi.c
@@ -55,6 +55,7 @@ MAKE_FUNCPTR(vaEndPicture);
@ -240,5 +240,5 @@ index 4c570f5..1b19684 100644
wine_dlclose(videoservice->va_x11_handle, NULL, 0);
if (videoservice->va_handle)
--
2.3.0
2.17.1