From d1d8902dccc3741de5f64dbed95d020e9efda3bf Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 20 Mar 2026 14:13:28 +0000 Subject: [PATCH] glx/windows: Add GLX_USE_WINDOWSGL in new places it's needed to build libGL Signed-off-by: Jon Turney Part-of: --- src/glx/glx_pbuffer.c | 4 ++-- src/glx/glxcmds.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index 6b7e6693f42..5a046a04343 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -203,7 +203,7 @@ DestroyDRIDrawable(Display *dpy, GLXDrawable drawable) } /* TODO: delete these after more refactoring */ -#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) && !defined(GLX_USE_WINDOWSGL) int dri3_get_buffer_age(__GLXDRIdrawable *pdraw); int @@ -262,7 +262,7 @@ __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable, if (!opcode) return 0; -#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) && !defined(GLX_USE_WINDOWSGL) pdraw = GetGLXDRIDrawable(dpy, drawable); if (attribute == GLX_BACK_BUFFER_AGE_EXT) { diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index f33af34a7a2..3c9edfa4e4c 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2338,7 +2338,7 @@ static const struct name_address_pair GLX_functions[] = { GLX_FUNCTION(glXQueryCurrentRendererStringMESA), /*** GLX_MESA_gl_interop ***/ -#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) && !defined(GLX_USE_WINDOWSGL) GLX_FUNCTION2(glXGLInteropQueryDeviceInfoMESA, MesaGLInteropGLXQueryDeviceInfo), GLX_FUNCTION2(glXGLInteropExportObjectMESA, MesaGLInteropGLXExportObject), GLX_FUNCTION2(glXGLInteropFlushObjectsMESA, MesaGLInteropGLXFlushObjects), @@ -2403,7 +2403,7 @@ GLX_ALIAS(__GLXextFuncPtr, glXGetProcAddress, (const GLubyte * procName), (procName), glXGetProcAddressARB) -#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) && !defined(GLX_USE_WINDOWSGL) PUBLIC int MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,