Added patch to check for 'Brian Paul' to detect Mesa gl_vendor.

This commit is contained in:
Sebastian Lackner 2017-05-28 23:34:20 +02:00
parent d7d4fde17e
commit 4d5cc8b76f
3 changed files with 45 additions and 0 deletions

View File

@ -435,6 +435,7 @@ patch_enable_all ()
enable_wined3d_buffer_create="$1"
enable_wined3d_check_format_support="$1"
enable_wined3d_glsl_ffp_vertex_lighting="$1"
enable_wined3d_wined3d_guess_gl_vendor="$1"
enable_winedbg_Process_Arguments="$1"
enable_winedevice_Fix_Relocation="$1"
enable_winemenubuilder_Desktop_Icon_Path="$1"
@ -1544,6 +1545,9 @@ patch_enable ()
wined3d-glsl_ffp_vertex_lighting)
enable_wined3d_glsl_ffp_vertex_lighting="$2"
;;
wined3d-wined3d_guess_gl_vendor)
enable_wined3d_wined3d_guess_gl_vendor="$2"
;;
winedbg-Process_Arguments)
enable_winedbg_Process_Arguments="$2"
;;
@ -8965,6 +8969,21 @@ if test "$enable_wined3d_glsl_ffp_vertex_lighting" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-wined3d_guess_gl_vendor
# |
# | This patchset fixes the following Wine bugs:
# | * [#42538] Add check for GL_VENDOR = "Brian Paul" to detect Mesa
# |
# | Modified files:
# | * dlls/wined3d/directx.c
# |
if test "$enable_wined3d_wined3d_guess_gl_vendor" -eq 1; then
patch_apply wined3d-wined3d_guess_gl_vendor/0001-wined3d-Also-check-for-Brian-Paul-to-detect-Mesa-gl_.patch
(
printf '%s\n' '+ { "Jarkko Korpi", "wined3d: Also check for '\''Brian Paul'\'' to detect Mesa gl_vendor.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Main
# |
# | This patchset has the following (direct or indirect) dependencies:

View File

@ -0,0 +1,25 @@
From 5b080b413d64e68feeddfa6b843835a508ce2262 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Tue, 16 May 2017 15:39:29 +0300
Subject: wined3d: Also check for 'Brian Paul' to detect Mesa gl_vendor.
As already done in wined3d_guess_card_vendor.
---
dlls/wined3d/directx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7273d6cec10..6366fb2a16a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1783,6 +1783,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in
return GL_VENDOR_FGLRX;
if (strstr(gl_vendor_string, "Mesa")
+ || strstr(gl_vendor_string, "Brian Paul")
|| strstr(gl_vendor_string, "X.Org")
|| strstr(gl_vendor_string, "Advanced Micro Devices, Inc.")
|| strstr(gl_vendor_string, "DRI R300 Project")
--
2.12.2

View File

@ -0,0 +1 @@
Fixes: [42538] Add check for GL_VENDOR = "Brian Paul" to detect Mesa