From bd3794c11e682e8489959ff79405396f742ee7c4 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 17 Sep 2018 14:13:42 +1000
Subject: [PATCH] Removed opengl32-Revert_Disable_Ext patchset

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
---
 ...Return-a-NULL-pointer-for-functions-.patch | 43 -------------------
 patches/patchinstall.sh                       | 16 -------
 2 files changed, 59 deletions(-)
 delete mode 100644 patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch

diff --git a/patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch b/patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch
deleted file mode 100644
index 5411b797..00000000
--- a/patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch
+++ /dev/null
@@ -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
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 2c4f8eb3..5f4cbb64 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -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: