[PATCH 1/9] opengl32: Remove deprecated WGL_RENDERER_ID_WINE constant.

[Rémi Bernon]

From: Rémi Bernon

GLX_RENDERER_ID_MESA has been removed from GLX_MESA_query_renderer v9.
---
 dlls/opengl32/winegl.xml  |  2 --
 dlls/winemac.drv/opengl.c | 45 ---------------------------------------
 dlls/winex11.drv/opengl.c |  5 -----
 include/wine/wgl.h        |  1 -
 4 files changed, 53 deletions(-)

diff --git a/dlls/opengl32/winegl.xml b/dlls/opengl32/winegl.xml
index 7918c3ff894..37152805ace 100644
--- a/dlls/opengl32/winegl.xml
+++ b/dlls/opengl32/winegl.xml
@@ -354,7 +354,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
         <enum value="0x818B" name="WGL_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_WINE"/>
         <enum value="0x818C" name="WGL_RENDERER_OPENGL_ES_PROFILE_VERSION_WINE"/>
         <enum value="0x818D" name="WGL_RENDERER_OPENGL_ES2_PROFILE_VERSION_WINE"/>
-        <enum value="0x818E" name="WGL_RENDERER_ID_WINE"/>
     </enums>

<extensions>
@@ -422,7 +421,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <require>
                 <enum name="WGL_RENDERER_ACCELERATED_WINE"/>
                 <enum name="WGL_RENDERER_DEVICE_ID_WINE"/>
-                <enum name="WGL_RENDERER_ID_WINE"/>
                 <enum name="WGL_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_WINE"/>
                 <enum name="WGL_RENDERER_OPENGL_CORE_PROFILE_VERSION_WINE"/>
                 <enum name="WGL_RENDERER_OPENGL_ES2_PROFILE_VERSION_WINE"/>
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index 7f145b73711..e60fc04a82e 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -270,7 +270,6 @@ static const char* debugstr_attrib(int attrib, int value)
         ATTRIB(WGL_PIXEL_TYPE_ARB),
         ATTRIB(WGL_RED_BITS_ARB),
         ATTRIB(WGL_RED_SHIFT_ARB),
-        ATTRIB(WGL_RENDERER_ID_WINE),
         ATTRIB(WGL_SAMPLE_BUFFERS_ARB),
         ATTRIB(WGL_SAMPLES_ARB),
         ATTRIB(WGL_SHARE_ACCUM_ARB),
@@ -2151,50 +2150,6 @@ static BOOL macdrv_context_create(int format, void *shared, const int *attrib_li
                 profile = value;
                 break;

-            case WGL_RENDERER_ID_WINE:
-            {
-                CGLError err;
-                CGLRendererInfoObj renderer_info;
-                GLint renderer_count, temp;
-
-                err = CGLQueryRendererInfo(active_displays_mask(), &renderer_info, &renderer_count);
-                if (err != kCGLNoError)
-                {
-                    WARN("CGLQueryRendererInfo failed: %d %s\n", err, CGLErrorString(err));
-                    RtlSetLastWin32Error(ERROR_GEN_FAILURE);
-                    return FALSE;
-                }
-
-                value = map_renderer_index(renderer_info, renderer_count, value);
-
-                if (value >= renderer_count)
-                {
-                    WARN("WGL_RENDERER_ID_WINE renderer %d exceeds count (%d)\n", value, renderer_count);
-                    CGLDestroyRendererInfo(renderer_info);
-                    RtlSetLastWin32Error(ERROR_INVALID_PARAMETER);
-                    return FALSE;
-                }
-
-                if (!get_renderer_property(renderer_info, value, kCGLRPRendererID, &temp))
-                {
-                    WARN("WGL_RENDERER_ID_WINE failed to get ID of renderer %d\n", value);
-                    CGLDestroyRendererInfo(renderer_info);
-                    RtlSetLastWin32Error(ERROR_GEN_FAILURE);
-                    return FALSE;
-                }
-
-                CGLDestroyRendererInfo(renderer_info);
-
-                if (renderer_id && temp != renderer_id)
-                {
-                    WARN("WGL_RENDERER_ID_WINE requested two different renderers (0x%08x vs. 0x%08x)\n", renderer_id, temp);
-                    RtlSetLastWin32Error(ERROR_INVALID_PARAMETER);
-                    return FALSE;
-                }
-                renderer_id = temp;
-                break;
-            }
-
             default:
                 WARN("Unknown attribute %s.\n", debugstr_attrib(attr, value));
                 RtlSetLastWin32Error(ERROR_INVALID_PARAMETER);
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index b810689ff3d..c221adfdfae 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1238,11 +1238,6 @@ static BOOL x11drv_context_create( int format, void *share, const int *attribLis
                 pContextAttribList[1] = attribList[1];
                 pContextAttribList += 2;
                 break;
-            case WGL_RENDERER_ID_WINE:
-                pContextAttribList[0] = GLX_RENDERER_ID_MESA;
-                pContextAttribList[1] = attribList[1];
-                pContextAttribList += 2;
-                break;
             default:
                 ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]);
             }
diff --git a/include/wine/wgl.h b/include/wine/wgl.h
index d7bc3664b73..b2e4eff9997 100644
--- a/include/wine/wgl.h
+++ b/include/wine/wgl.h
@@ -5434,7 +5434,6 @@ typedef unsigned int GLhandleARB;
 #define WGL_RED_SHIFT_ARB                                             0x2016
 #define WGL_RENDERER_ACCELERATED_WINE                                 0x8186
 #define WGL_RENDERER_DEVICE_ID_WINE                                   0x8184
-#define WGL_RENDERER_ID_WINE                                          0x818E
 #define WGL_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_WINE        0x818B
 #define WGL_RENDERER_OPENGL_CORE_PROFILE_VERSION_WINE                 0x818A
 #define WGL_RENDERER_OPENGL_ES2_PROFILE_VERSION_WINE                  0x818D