wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed opengl32-Revert_Disable_Ext patchset

Browse Source 
All regression this was attempted to work around appear to be fixed.
Infact this is now causing a regression of its own
https://bugs.winehq.org/show_bug.cgi?id=45826
This commit is contained in:
Alistair Leslie-Hughes 2018-09-17 14:13:42 +10:00
parent 7cfceb78b2
commit bd3794c11e
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch
View File

@ -1,43 +0,0 @@
From b0535885132a6e2a6e7bebd9a0bad90a4414172b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 10 Apr 2015 08:17:22 +0200
Subject: [PATCH] Revert "opengl32: Return a NULL pointer for functions
requiring unsupported or disabled extensions."
This reverts commit bfd4836867d6d90eaeae6ccbc02e37678b59b8f1 and following changes.
---
dlls/opengl32/wgl.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 04ace8effe..716081125e 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -883,24 +883,7 @@ PROC WINAPI wglGetProcAddress( LPCSTR name )
void *driver_func = funcs->wgl.p_wglGetProcAddress( name );
if (!is_extension_supported(ext_ret->extension))
- {
- unsigned int i;
- static const struct { const char *name, *alt; } alternatives[] =
- {
- { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */
- { "glVertexAttribDivisor", "glVertexAttribDivisorARB"}, /* needed by Caffeine */
- };
-
- for (i = 0; i < ARRAY_SIZE(alternatives); i++)
- {
- if (strcmp( name, alternatives[i].name )) continue;
- WARN("Extension %s required for %s not supported, trying %s\n",
- ext_ret->extension, name, alternatives[i].alt );
- return wglGetProcAddress( alternatives[i].alt );
- }
WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
- return NULL;
- }
if (driver_func == NULL)
{
--
2.18.0

16
patches/patchinstall.sh
View File

@ -264,7 +264,6 @@ patch_enable_all ()
enable_oleaut32_OleLoadPictureFile="$1"
enable_oleaut32_TKIND_COCLASS="$1"
enable_oleaut32_x86_64_Marshaller="$1"
enable_opengl32_Revert_Disable_Ext="$1"
enable_opengl32_glDebugMessageCallback="$1"
enable_opengl32_wglChoosePixelFormat="$1"
enable_packager_DllMain="$1"
@ -961,9 +960,6 @@ patch_enable ()
oleaut32-x86_64_Marshaller)
enable_oleaut32_x86_64_Marshaller="$2"
;;
opengl32-Revert_Disable_Ext)
enable_opengl32_Revert_Disable_Ext="$2"
;;
opengl32-glDebugMessageCallback)
enable_opengl32_glDebugMessageCallback="$2"
;;
@ -5703,18 +5699,6 @@ if test "$enable_oleaut32_x86_64_Marshaller" -eq 1; then
) >> "$patchlist"
fi
# Patchset opengl32-Revert_Disable_Ext
# |
# | Modified files:
# | * dlls/opengl32/wgl.c
# |
if test "$enable_opengl32_Revert_Disable_Ext" -eq 1; then
patch_apply opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "Revert \"opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions.\".", 1 },';
) >> "$patchlist"
fi
# Patchset opengl32-glDebugMessageCallback
# |
# | This patchset fixes the following Wine bugs: