From 6ac3937630d138a2c839d1af6aba215538118123 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Sun, 22 Jul 2001 23:42:09 +0000 Subject: [PATCH] Commented out references to x11drv internals from MESA code. --- dlls/ddraw/d3ddevice/mesa.c | 10 +++++++--- dlls/ddraw/mesa_private.h | 1 - include/wine_gl.h | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index 21a2ef321a4..b86b9696b83 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -172,6 +172,7 @@ is_OpenGL( TRACE("Creating OpenGL device for surface %p\n", surface); /* Create the OpenGL context */ +#if COMPILABLE /* First get the correct visual */ ENTER_GL(); /* Create the context */ @@ -192,7 +193,6 @@ is_OpenGL( else TRACE("Context created (%p)\n", odev->ctx); -#if COMPILABLE /* Now override the surface's Flip method (if in double buffering) */ ((x11_ds_private *) surface->private)->opengl_flip = TRUE; { @@ -243,13 +243,15 @@ is_OpenGL( static ULONG WINAPI MESA_IDirect3DDevice2Impl_Release(LPDIRECT3DDEVICE2 iface) { ICOM_THIS(IDirect3DDevice2Impl,iface); - D3DDPRIVATE(This); FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { +#if 0 /* broken for now */ + D3DDPRIVATE(This); ENTER_GL(); glXDestroyContext(gdi_display, odev->ctx); LEAVE_GL(); +#endif This->private = NULL; HeapFree(GetProcessHeap(),0,This); return 0; @@ -834,6 +836,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi /* First get the correct visual */ /* if (surface->s.backbuffer == NULL) attributeList[3] = None; */ +#if 0 /* non working currently */ ENTER_GL(); xvis = glXChooseVisual(gdi_display, DefaultScreen(gdi_display), @@ -849,7 +852,6 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi GL_TRUE); TRACE("Context created\n"); -#if 0 /* non working currently */ /* Now override the surface's Flip method (if in double buffering) */ surface->s.d3d_device = (void *) odev; { @@ -889,10 +891,12 @@ static ULONG WINAPI MESA_IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface) FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { +#if 0 /* broken for now */ D3DDPRIVATE(This); ENTER_GL(); glXDestroyContext(gdi_display, odev->ctx); LEAVE_GL(); +#endif This->private = NULL; HeapFree(GetProcessHeap(),0,This); return 0; diff --git a/dlls/ddraw/mesa_private.h b/dlls/ddraw/mesa_private.h index 7edaaa09b26..dec0d04b00e 100644 --- a/dlls/ddraw/mesa_private.h +++ b/dlls/ddraw/mesa_private.h @@ -10,7 +10,6 @@ #include "d3d_private.h" #include "wine_gl.h" -#include "x11drv.h" /***************************************************************************** * IDirect3DLight MESA private structure diff --git a/include/wine_gl.h b/include/wine_gl.h index bc0a6036f97..2f3144f5452 100644 --- a/include/wine_gl.h +++ b/include/wine_gl.h @@ -12,7 +12,6 @@ #if defined(HAVE_OPENGL) #include "ts_xlib.h" -#include "x11drv.h" /* As GLX relies on X, this is needed */ #define ENTER_GL() wine_tsx11_lock() -- GitLab