Skip to content
Snippets Groups Projects
Commit 6ac39376 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Commented out references to x11drv internals from MESA code.

parent 0dd55c44
No related branches found
No related tags found
No related merge requests found
...@@ -172,6 +172,7 @@ is_OpenGL( ...@@ -172,6 +172,7 @@ is_OpenGL(
TRACE("Creating OpenGL device for surface %p\n", surface); TRACE("Creating OpenGL device for surface %p\n", surface);
/* Create the OpenGL context */ /* Create the OpenGL context */
#if COMPILABLE
/* First get the correct visual */ /* First get the correct visual */
ENTER_GL(); ENTER_GL();
/* Create the context */ /* Create the context */
...@@ -192,7 +193,6 @@ is_OpenGL( ...@@ -192,7 +193,6 @@ is_OpenGL(
else else
TRACE("Context created (%p)\n", odev->ctx); TRACE("Context created (%p)\n", odev->ctx);
#if COMPILABLE
/* Now override the surface's Flip method (if in double buffering) */ /* Now override the surface's Flip method (if in double buffering) */
((x11_ds_private *) surface->private)->opengl_flip = TRUE; ((x11_ds_private *) surface->private)->opengl_flip = TRUE;
{ {
...@@ -243,13 +243,15 @@ is_OpenGL( ...@@ -243,13 +243,15 @@ is_OpenGL(
static ULONG WINAPI MESA_IDirect3DDevice2Impl_Release(LPDIRECT3DDEVICE2 iface) static ULONG WINAPI MESA_IDirect3DDevice2Impl_Release(LPDIRECT3DDEVICE2 iface)
{ {
ICOM_THIS(IDirect3DDevice2Impl,iface); ICOM_THIS(IDirect3DDevice2Impl,iface);
D3DDPRIVATE(This);
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) { if (!--(This->ref)) {
#if 0 /* broken for now */
D3DDPRIVATE(This);
ENTER_GL(); ENTER_GL();
glXDestroyContext(gdi_display, odev->ctx); glXDestroyContext(gdi_display, odev->ctx);
LEAVE_GL(); LEAVE_GL();
#endif
This->private = NULL; This->private = NULL;
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return 0;
...@@ -834,6 +836,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi ...@@ -834,6 +836,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
/* First get the correct visual */ /* First get the correct visual */
/* if (surface->s.backbuffer == NULL) /* if (surface->s.backbuffer == NULL)
attributeList[3] = None; */ attributeList[3] = None; */
#if 0 /* non working currently */
ENTER_GL(); ENTER_GL();
xvis = glXChooseVisual(gdi_display, xvis = glXChooseVisual(gdi_display,
DefaultScreen(gdi_display), DefaultScreen(gdi_display),
...@@ -849,7 +852,6 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi ...@@ -849,7 +852,6 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
GL_TRUE); GL_TRUE);
TRACE("Context created\n"); TRACE("Context created\n");
#if 0 /* non working currently */
/* Now override the surface's Flip method (if in double buffering) */ /* Now override the surface's Flip method (if in double buffering) */
surface->s.d3d_device = (void *) odev; surface->s.d3d_device = (void *) odev;
{ {
...@@ -889,10 +891,12 @@ static ULONG WINAPI MESA_IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface) ...@@ -889,10 +891,12 @@ static ULONG WINAPI MESA_IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface)
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) { if (!--(This->ref)) {
#if 0 /* broken for now */
D3DDPRIVATE(This); D3DDPRIVATE(This);
ENTER_GL(); ENTER_GL();
glXDestroyContext(gdi_display, odev->ctx); glXDestroyContext(gdi_display, odev->ctx);
LEAVE_GL(); LEAVE_GL();
#endif
This->private = NULL; This->private = NULL;
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return 0;
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "d3d_private.h" #include "d3d_private.h"
#include "wine_gl.h" #include "wine_gl.h"
#include "x11drv.h"
/***************************************************************************** /*****************************************************************************
* IDirect3DLight MESA private structure * IDirect3DLight MESA private structure
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
#include "ts_xlib.h" #include "ts_xlib.h"
#include "x11drv.h"
/* As GLX relies on X, this is needed */ /* As GLX relies on X, this is needed */
#define ENTER_GL() wine_tsx11_lock() #define ENTER_GL() wine_tsx11_lock()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment