Skip to content

W
wine-cw
Commit 5f99b59e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Add an OpenGL GDI driver.

parent eb80e6f2
Show whitespace changes
Inline Side-by-side
Showing with 349 additions and 256 deletions
dlls/winex11.drv/init.c
View file @ 5f99b59e
......@@ -134,6 +134,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
{
const struct gdi_dc_funcs *glx_funcs = get_glx_driver();
X11DRV_PDEVICE *physDev = create_x11_physdev( root_window );
if (!physDev) return FALSE;
......@@ -144,8 +145,9 @@ static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left,
virtual_screen_rect.bottom - virtual_screen_rect.top );
push_dc_driver( pdev, &physDev->dev, &x11drv_funcs );
if (!xrender_funcs) return TRUE;
return xrender_funcs->pCreateDC( pdev, driver, device, output, initData );
if (xrender_funcs && !xrender_funcs->pCreateDC( pdev, driver, device, output, initData )) return FALSE;
if (glx_funcs && !glx_funcs->pCreateDC( pdev, driver, device, output, initData )) return FALSE;
return TRUE;
}
......@@ -154,6 +156,7 @@ static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
*/
static BOOL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
{
const struct gdi_dc_funcs *glx_funcs = get_glx_driver();
X11DRV_PDEVICE *physDev = create_x11_physdev( BITMAP_stock_phys_bitmap.pixmap );
if (!physDev) return FALSE;
......@@ -167,8 +170,9 @@ static BOOL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
physDev->dc_rect = physDev->drawable_rect;
push_dc_driver( pdev, &physDev->dev, &x11drv_funcs );
if (orig) return TRUE; /* we already went through Xrender if we have an orig device */
if (!xrender_funcs) return TRUE;
return xrender_funcs->pCreateCompatibleDC( NULL, pdev );
if (xrender_funcs && !xrender_funcs->pCreateCompatibleDC( NULL, pdev )) return FALSE;
if (glx_funcs && !glx_funcs->pCreateCompatibleDC( NULL, pdev )) return FALSE;
return TRUE;
}
......@@ -435,6 +439,85 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
}
static inline void opengl_error(void)
{
static int warned;
if (!warned++) ERR("No OpenGL support compiled in.\n");
}
/***********************************************************************
* X11DRV_ChoosePixelFormat
*/
static int X11DRV_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd )
{
opengl_error();
return 0;
}
/***********************************************************************
* X11DRV_DescribePixelFormat
*/
static int X11DRV_DescribePixelFormat( PHYSDEV dev, int fmt, UINT size, PIXELFORMATDESCRIPTOR *ppfd )
{
opengl_error();
return 0;
}
/***********************************************************************
* X11DRV_SetPixelFormat
*/
static BOOL X11DRV_SetPixelFormat( PHYSDEV dev, int fmt, const PIXELFORMATDESCRIPTOR *ppfd )
{
opengl_error();
return FALSE;
}
/***********************************************************************
* X11DRV_wglCreateContext
*/
static HGLRC X11DRV_wglCreateContext( PHYSDEV dev )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglCreateContextAttribsARB
*/
static HGLRC X11DRV_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC hShareContext, const int* attribList )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglGetProcAddress
*/
static PROC X11DRV_wglGetProcAddress( LPCSTR proc )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglGetPbufferDCARB
*/
static HDC X11DRV_wglGetPbufferDCARB( PHYSDEV dev, void *hPbuffer )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglSetPixelFormatWINE
*/
static BOOL X11DRV_wglSetPixelFormatWINE( PHYSDEV dev, int fmt, const PIXELFORMATDESCRIPTOR *ppfd )
{
opengl_error();
return FALSE;
}
static const struct gdi_dc_funcs x11drv_funcs =
{
NULL, /* pAbortDoc */
......@@ -492,7 +575,7 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_GetNearestColor, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
X11DRV_GetPixelFormat, /* pGetPixelFormat */
NULL, /* pGetPixelFormat */
X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -568,21 +651,21 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pStretchDIBits */
NULL, /* pStrokeAndFillPath */
NULL, /* pStrokePath */
X11DRV_SwapBuffers, /* pSwapBuffers */
NULL, /* pSwapBuffers */
X11DRV_UnrealizePalette, /* pUnrealizePalette */
NULL, /* pWidenPath */
X11DRV_wglCopyContext, /* pwglCopyContext */
NULL, /* pwglCopyContext */
X11DRV_wglCreateContext, /* pwglCreateContext */
X11DRV_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
X11DRV_wglDeleteContext, /* pwglDeleteContext */
NULL, /* pwglDeleteContext */
X11DRV_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */
X11DRV_wglGetProcAddress, /* pwglGetProcAddress */
X11DRV_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */
X11DRV_wglMakeCurrent, /* pwglMakeCurrent */
NULL, /* pwglMakeContextCurrentARB */
NULL, /* pwglMakeCurrent */
X11DRV_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */
X11DRV_wglShareLists, /* pwglShareLists */
X11DRV_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */
X11DRV_wglUseFontBitmapsW, /* pwglUseFontBitmapsW */
NULL, /* pwglShareLists */
NULL, /* pwglUseFontBitmapsA */
NULL, /* pwglUseFontBitmapsW */
GDI_PRIORITY_GRAPHICS_DRV /* priority */
};
......
dlls/winex11.drv/opengl.c
View file @ 5f99b59e
......@@ -145,6 +145,19 @@ typedef struct wine_glpbuffer {
int texture_level;
} Wine_GLPBuffer;
struct glx_physdev
{
struct gdi_physdev dev;
X11DRV_PDEVICE *x11dev;
};
static const struct gdi_dc_funcs glxdrv_funcs;
static inline struct glx_physdev *get_glxdrv_dev( PHYSDEV dev )
{
return (struct glx_physdev *)dev;
}
static struct list context_list = LIST_INIT( context_list );
static struct WineGLInfo WineGLInfo = { 0 };
static int use_render_texture_emulation = 1;
......@@ -422,12 +435,6 @@ done:
return ret;
}
void X11DRV_OpenGL_Cleanup(void)
{
HeapFree(GetProcessHeap(), 0, WineGLInfo.glExtensions);
infoInitialized = FALSE;
}
static BOOL has_opengl(void)
{
static int init_done;
......@@ -610,10 +617,6 @@ failed:
return FALSE;
}
static inline void free_context(Wine_GLContext *context)
{
}
static inline BOOL is_valid_context( Wine_GLContext *ctx )
{
Wine_GLContext *ptr;
......@@ -1180,13 +1183,13 @@ static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev, WineGLPixelFormat *f
}
/**
* X11DRV_ChoosePixelFormat
* glxdrv_ChoosePixelFormat
*
* Equivalent to glXChooseVisual.
*/
int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd)
static int glxdrv_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
WineGLPixelFormat *list;
int onscreen_size;
int ret = 0;
......@@ -1377,15 +1380,16 @@ int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd)
return ret;
}
/**
* X11DRV_DescribePixelFormat
* glxdrv_DescribePixelFormat
*
* Get the pixel-format descriptor associated to the given id
*/
int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat,
static int glxdrv_DescribePixelFormat(PHYSDEV dev, int iPixelFormat,
UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
/*XVisualInfo *vis;*/
int value;
int rb,gb,bb,ab;
......@@ -1522,13 +1526,13 @@ int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat,
}
/**
* X11DRV_GetPixelFormat
* glxdrv_GetPixelFormat
*
* Get the pixel-format id used by this DC
*/
int X11DRV_GetPixelFormat(PHYSDEV dev)
static int glxdrv_GetPixelFormat(PHYSDEV dev)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
WineGLPixelFormat *fmt;
int tmp;
TRACE("(%p)\n", physDev);
......@@ -1634,13 +1638,13 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev,
/**
* X11DRV_SetPixelFormat
* glxdrv_SetPixelFormat
*
* Set the pixel-format id used by this DC
*/
BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd);
......@@ -1653,11 +1657,11 @@ BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCR
}
/**
* X11DRV_wglCopyContext
* glxdrv_wglCopyContext
*
* For OpenGL32 wglCopyContext.
*/
BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
static BOOL glxdrv_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
{
Wine_GLContext *src = (Wine_GLContext*)hglrcSrc;
Wine_GLContext *dst = (Wine_GLContext*)hglrcDst;
......@@ -1677,9 +1681,9 @@ BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
*
* For OpenGL32 wglCreateContext.
*/
HGLRC X11DRV_wglCreateContext(PHYSDEV dev)
static HGLRC glxdrv_wglCreateContext(PHYSDEV dev)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
Wine_GLContext *ret;
WineGLPixelFormat *fmt;
int hdcPF = physDev->current_pf;
......@@ -1719,11 +1723,11 @@ HGLRC X11DRV_wglCreateContext(PHYSDEV dev)
}
/**
* X11DRV_wglDeleteContext
* glxdrv_wglDeleteContext
*
* For OpenGL32 wglDeleteContext.
*/
BOOL X11DRV_wglDeleteContext(HGLRC hglrc)
static BOOL glxdrv_wglDeleteContext(HGLRC hglrc)
{
Wine_GLContext *ctx = (Wine_GLContext *) hglrc;
......@@ -1777,11 +1781,11 @@ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void)
}
/**
* X11DRV_wglGetProcAddress
* glxdrv_wglGetProcAddress
*
* For OpenGL32 wglGetProcAddress.
*/
PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc)
static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc)
{
int i, j;
const WineGLExtension *ext;
......@@ -1814,13 +1818,13 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc)
}
/**
* X11DRV_wglMakeCurrent
* glxdrv_wglMakeCurrent
*
* For OpenGL32 wglMakeCurrent.
*/
BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc)
static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
BOOL ret;
HDC hdc = dev->hdc;
Wine_GLContext *ctx = (Wine_GLContext *) hglrc;
......@@ -1888,14 +1892,14 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc)
}
/**
* X11DRV_wglMakeContextCurrentARB
* glxdrv_wglMakeContextCurrentARB
*
* For OpenGL32 wglMakeContextCurrentARB
*/
BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc )
static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc )
{
X11DRV_PDEVICE *pDrawDev = get_x11drv_dev( draw_dev );
X11DRV_PDEVICE *pReadDev = get_x11drv_dev( read_dev );
X11DRV_PDEVICE *pDrawDev = get_glxdrv_dev( draw_dev )->x11dev;
X11DRV_PDEVICE *pReadDev = get_glxdrv_dev( read_dev )->x11dev;
BOOL ret;
TRACE("(%p,%p,%p)\n", pDrawDev, pReadDev, hglrc);
......@@ -1950,11 +1954,11 @@ BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC
}
/**
* X11DRV_wglShareLists
* glxdrv_wglShareLists
*
* For OpenGL32 wglShareLists.
*/
BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
static BOOL glxdrv_wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
{
Wine_GLContext *org = (Wine_GLContext *) hglrc1;
Wine_GLContext *dest = (Wine_GLContext *) hglrc2;
......@@ -2119,11 +2123,11 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
}
/**
* X11DRV_wglUseFontBitmapsA
* glxdrv_wglUseFontBitmapsA
*
* For OpenGL32 wglUseFontBitmapsA.
*/
BOOL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
static BOOL glxdrv_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
{
TRACE("(%p, %d, %d, %d)\n", dev->hdc, first, count, listBase);
......@@ -2132,11 +2136,11 @@ BOOL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD list
}
/**
* X11DRV_wglUseFontBitmapsW
* glxdrv_wglUseFontBitmapsW
*
* For OpenGL32 wglUseFontBitmapsW.
*/
BOOL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
static BOOL glxdrv_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
{
TRACE("(%p, %d, %d, %d)\n", dev->hdc, first, count, listBase);
......@@ -2237,13 +2241,13 @@ static void WINAPI X11DRV_wglFlush(void)
}
/**
* X11DRV_wglCreateContextAttribsARB
* glxdrv_wglCreateContextAttribsARB
*
* WGL_ARB_create_context: wglCreateContextAttribsARB
*/
HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList)
static HGLRC glxdrv_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
Wine_GLContext *ret;
WineGLPixelFormat *fmt;
int hdcPF = physDev->current_pf;
......@@ -2585,16 +2589,16 @@ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer)
}
/**
* X11DRV_wglGetPbufferDCARB
* glxdrv_wglGetPbufferDCARB
*
* WGL_ARB_pbuffer: wglGetPbufferDCARB
* The function wglGetPbufferDCARB returns a device context for a pbuffer.
* Gdi32 implements the part of this function which creates a device context.
* This part associates the physDev with the X drawable of the pbuffer.
*/
HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer)
static HDC glxdrv_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
Wine_GLPBuffer* object = hPbuffer;
if (NULL == object) {
......@@ -3434,14 +3438,14 @@ static void WINAPI X11DRV_wglFreeMemoryNV(GLvoid* pointer) {
}
/**
* X11DRV_wglSetPixelFormatWINE
* glxdrv_wglSetPixelFormatWINE
*
* WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE
* This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times.
*/
BOOL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
static BOOL glxdrv_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd);
......@@ -3516,7 +3520,7 @@ static const WineGLExtension WGL_ARB_create_context =
{
"WGL_ARB_create_context",
{
{ "wglCreateContextAttribsARB", X11DRV_wglCreateContextAttribsARB },
{ "wglCreateContextAttribsARB", (void *)1 /* not called directly */ },
}
};
......@@ -3533,7 +3537,7 @@ static const WineGLExtension WGL_ARB_make_current_read =
"WGL_ARB_make_current_read",
{
{ "wglGetCurrentReadDCARB", X11DRV_wglGetCurrentReadDCARB },
{ "wglMakeContextCurrentARB", X11DRV_wglMakeContextCurrentARB },
{ "wglMakeContextCurrentARB", (void *)1 /* not called directly */ },
}
};
......@@ -3548,7 +3552,7 @@ static const WineGLExtension WGL_ARB_pbuffer =
{
{ "wglCreatePbufferARB", X11DRV_wglCreatePbufferARB },
{ "wglDestroyPbufferARB", X11DRV_wglDestroyPbufferARB },
{ "wglGetPbufferDCARB", X11DRV_wglGetPbufferDCARB },
{ "wglGetPbufferDCARB", (void *)1 /* not called directly */ },
{ "wglQueryPbufferARB", X11DRV_wglQueryPbufferARB },
{ "wglReleasePbufferDCARB", X11DRV_wglReleasePbufferDCARB },
{ "wglSetPbufferAttribARB", X11DRV_wglSetPbufferAttribARB },
......@@ -3604,7 +3608,7 @@ static const WineGLExtension WGL_WINE_pixel_format_passthrough =
{
"WGL_WINE_pixel_format_passthrough",
{
{ "wglSetPixelFormatWINE", X11DRV_wglSetPixelFormatWINE },
{ "wglSetPixelFormatWINE", (void *)1 /* not called directly */ },
}
};
......@@ -3713,13 +3717,13 @@ BOOL destroy_glxpixmap(Display *display, XID glxpixmap)
}
/**
* X11DRV_SwapBuffers
* glxdrv_SwapBuffers
*
* Swap the buffers of this DC
*/
BOOL X11DRV_SwapBuffers(PHYSDEV dev)
static BOOL glxdrv_SwapBuffers(PHYSDEV dev)
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
X11DRV_PDEVICE *physDev = get_glxdrv_dev( dev )->x11dev;
Wine_GLContext *ctx = NtCurrentTeb()->glContext;
if (!has_opengl()) return FALSE;
......@@ -3803,203 +3807,232 @@ XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id )
return ret;
}
#else /* no OpenGL includes */
void X11DRV_OpenGL_Cleanup(void)
static BOOL create_glx_dc( PHYSDEV *pdev )
{
}
static inline void opengl_error(void)
{
static int warned;
if (!warned++) ERR("No OpenGL support compiled in.\n");
}
int pixelformat_from_fbconfig_id(XID fbconfig_id)
{
return 0;
}
void mark_drawable_dirty(Drawable old, Drawable new)
{
}
void flush_gl_drawable(X11DRV_PDEVICE *physDev)
{
}
/* assume that only the main x11 device implements GetDeviceCaps */
X11DRV_PDEVICE *x11dev = get_x11drv_dev( GET_NEXT_PHYSDEV( *pdev, pGetDeviceCaps ));
struct glx_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) );
Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent)
{
return 0;
}
/***********************************************************************
* ChoosePixelFormat (X11DRV.@)
*/
int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd)
{
opengl_error();
return 0;
}
/***********************************************************************
* DescribePixelFormat (X11DRV.@)
*/
int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
{
opengl_error();
return 0;
}
/***********************************************************************
* GetPixelFormat (X11DRV.@)
*/
int X11DRV_GetPixelFormat(PHYSDEV dev)
{
opengl_error();
return 0;
if (!physdev) return FALSE;
physdev->x11dev = x11dev;
push_dc_driver( pdev, &physdev->dev, &glxdrv_funcs );
return TRUE;
}
/***********************************************************************
* SetPixelFormat (X11DRV.@)
/**********************************************************************
* glxdrv_CreateDC
*/
BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
static BOOL glxdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
{
opengl_error();
return FALSE;
return create_glx_dc( pdev );
}
/***********************************************************************
* SwapBuffers (X11DRV.@)
/**********************************************************************
* glxdrv_CreateCompatibleDC
*/
BOOL X11DRV_SwapBuffers(PHYSDEV dev)
static BOOL glxdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
{
opengl_error();
return FALSE;
if (orig) /* chain to next driver first */
{
orig = GET_NEXT_PHYSDEV( orig, pCreateCompatibleDC );
if (!orig->funcs->pCreateCompatibleDC( orig, pdev )) return FALSE;
}
/* otherwise we have been called by x11drv */
return create_glx_dc( pdev );
}
/**
* X11DRV_wglCopyContext
*
* For OpenGL32 wglCopyContext.
/**********************************************************************
* glxdrv_DeleteDC
*/
BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
static BOOL glxdrv_DeleteDC( PHYSDEV dev )
{
opengl_error();
return FALSE;
}
/**
* X11DRV_wglCreateContext
*
* For OpenGL32 wglCreateContext.
*/
HGLRC X11DRV_wglCreateContext(PHYSDEV dev)
{
opengl_error();
return NULL;
struct glx_physdev *physdev = get_glxdrv_dev( dev );
HeapFree( GetProcessHeap(), 0, physdev );
return TRUE;
}
/**
* X11DRV_wglCreateContextAttribsARB
*
* WGL_ARB_create_context: wglCreateContextAttribsARB
*/
HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList)
{
opengl_error();
return NULL;
}
static const struct gdi_dc_funcs glxdrv_funcs =
{
NULL, /* pAbortDoc */
NULL, /* pAbortPath */
NULL, /* pAlphaBlend */
NULL, /* pAngleArc */
NULL, /* pArc */
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pBlendImage */
glxdrv_ChoosePixelFormat, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
glxdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
glxdrv_CreateDC, /* pCreateDC */
NULL, /* pDeleteBitmap */
glxdrv_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
glxdrv_DescribePixelFormat, /* pDescribePixelFormat */
NULL, /* pDeviceCapabilities */
NULL, /* pEllipse */
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
NULL, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
NULL, /* pExtEscape */
NULL, /* pExtFloodFill */
NULL, /* pExtSelectClipRgn */
NULL, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGdiComment */
NULL, /* pGdiRealizationInfo */
NULL, /* pGetBoundsRect */
NULL, /* pGetCharABCWidths */
NULL, /* pGetCharABCWidthsI */
NULL, /* pGetCharWidth */
NULL, /* pGetDeviceCaps */
NULL, /* pGetDeviceGammaRamp */
NULL, /* pGetFontData */
NULL, /* pGetFontUnicodeRanges */
NULL, /* pGetGlyphIndices */
NULL, /* pGetGlyphOutline */
NULL, /* pGetICMProfile */
NULL, /* pGetImage */
NULL, /* pGetKerningPairs */
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
glxdrv_GetPixelFormat, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
NULL, /* pGetTextExtentExPointI */
NULL, /* pGetTextFace */
NULL, /* pGetTextMetrics */
NULL, /* pGradientFill */
NULL, /* pIntersectClipRect */
NULL, /* pInvertRgn */
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
NULL, /* pOffsetClipRgn */
NULL, /* pOffsetViewportOrg */
NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
NULL, /* pPolyBezier */
NULL, /* pPolyBezierTo */
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
NULL, /* pRealizePalette */
NULL, /* pRectangle */
NULL, /* pResetDC */
NULL, /* pRestoreDC */
NULL, /* pRoundRect */
NULL, /* pSaveDC */
NULL, /* pScaleViewportExt */
NULL, /* pScaleWindowExt */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBkMode */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
NULL, /* pSetDCPenColor */
NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
glxdrv_SetPixelFormat, /* pSetPixelFormat */
NULL, /* pSetPolyFillMode */
NULL, /* pSetROP2 */
NULL, /* pSetRelAbs */
NULL, /* pSetStretchBltMode */
NULL, /* pSetTextAlign */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */
NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
NULL, /* pStretchBlt */
NULL, /* pStretchDIBits */
NULL, /* pStrokeAndFillPath */
NULL, /* pStrokePath */
glxdrv_SwapBuffers, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
glxdrv_wglCopyContext, /* pwglCopyContext */
glxdrv_wglCreateContext, /* pwglCreateContext */
glxdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
glxdrv_wglDeleteContext, /* pwglDeleteContext */
glxdrv_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */
glxdrv_wglGetProcAddress, /* pwglGetProcAddress */
glxdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */
glxdrv_wglMakeCurrent, /* pwglMakeCurrent */
glxdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */
glxdrv_wglShareLists, /* pwglShareLists */
glxdrv_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */
glxdrv_wglUseFontBitmapsW, /* pwglUseFontBitmapsW */
GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */
};
/**
* X11DRV_wglDeleteContext
*
* For OpenGL32 wglDeleteContext.
*/
BOOL X11DRV_wglDeleteContext(HGLRC hglrc)
const struct gdi_dc_funcs *get_glx_driver(void)
{
opengl_error();
return FALSE;
return &glxdrv_funcs;
}
/**
* X11DRV_wglGetProcAddress
*
* For OpenGL32 wglGetProcAddress.
*/
PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc)
{
opengl_error();
return NULL;
}
#else /* no OpenGL includes */
HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, void *hPbuffer)
const struct gdi_dc_funcs *get_glx_driver(void)
{
opengl_error();
return NULL;
}
BOOL X11DRV_wglMakeContextCurrentARB(PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc)
{
opengl_error();
return FALSE;
}
/**
* X11DRV_wglMakeCurrent
*
* For OpenGL32 wglMakeCurrent.
*/
BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc)
int pixelformat_from_fbconfig_id(XID fbconfig_id)
{
opengl_error();
return FALSE;
return 0;
}
/**
* X11DRV_wglShareLists
*
* For OpenGL32 wglShareLists.
*/
BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
void mark_drawable_dirty(Drawable old, Drawable new)
{
opengl_error();
return FALSE;
}
/**
* X11DRV_wglUseFontBitmapsA
*
* For OpenGL32 wglUseFontBitmapsA.
*/
BOOL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
void flush_gl_drawable(X11DRV_PDEVICE *physDev)
{
opengl_error();
return FALSE;
}
/**
* X11DRV_wglUseFontBitmapsW
*
* For OpenGL32 wglUseFontBitmapsW.
*/
BOOL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase)
Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent)
{
opengl_error();
return FALSE;
return 0;
}
/**
* X11DRV_wglSetPixelFormatWINE
*
* WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE
* This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times.
*/
BOOL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd)
{
opengl_error();
return FALSE;
}
BOOL destroy_glxpixmap(Display *display, XID glxpixmap)
{
......
dlls/winex11.drv/x11drv.h
View file @ 5f99b59e
......@@ -216,32 +216,9 @@ extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_H
extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN;
extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN;
extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) DECLSPEC_HIDDEN;
extern HGLRC X11DRV_wglCreateContext( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern HGLRC X11DRV_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC hShareContext, const int* attribList ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglDeleteContext( HGLRC hglrc ) DECLSPEC_HIDDEN;
extern PROC X11DRV_wglGetProcAddress( LPCSTR proc ) DECLSPEC_HIDDEN;
extern HDC X11DRV_wglGetPbufferDCARB( PHYSDEV dev, void *pbuffer ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglMakeCurrent( PHYSDEV dev, HGLRC hglrc ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglSetPixelFormatWINE( PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglShareLists( HGLRC hglrc1, HGLRC hglrc2 ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglUseFontBitmapsA( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_wglUseFontBitmapsW( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN;
/* OpenGL / X11 driver functions */
extern int X11DRV_ChoosePixelFormat(PHYSDEV dev,
const PIXELFORMATDESCRIPTOR *pppfd) DECLSPEC_HIDDEN;
extern int X11DRV_DescribePixelFormat(PHYSDEV dev,
int iPixelFormat, UINT nBytes,
PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN;
extern int X11DRV_GetPixelFormat(PHYSDEV dev) DECLSPEC_HIDDEN;
extern BOOL X11DRV_SwapBuffers(PHYSDEV dev) DECLSPEC_HIDDEN;
extern void X11DRV_OpenGL_Cleanup(void) DECLSPEC_HIDDEN;
/* X11 driver internal functions */
......@@ -280,6 +257,7 @@ extern int client_side_antialias_with_render DECLSPEC_HIDDEN;
extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN;
extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN;
extern const struct gdi_dc_funcs *get_glx_driver(void) DECLSPEC_HIDDEN;
extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN;
/* IME support */
......
dlls/winex11.drv/x11drv_main.c
View file @ 5f99b59e
......@@ -633,7 +633,6 @@ static void process_detach(void)
/* cleanup GDI */
X11DRV_GDI_Finalize();
X11DRV_OpenGL_Cleanup();
IME_UnregisterClasses();
DeleteCriticalSection( &X11DRV_CritSection );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment