Skip to content

W
wine-cw
Commit 6a9dcd51 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Remove the remaining OpenGL entry points from the DC driver.

parent 855f2254
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 117 deletions
dlls/gdi32/dibdrv/dc.c
View file @ 6a9dcd51
......@@ -403,7 +403,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_ArcTo, /* pArcTo */
NULL, /* pBeginPath */
dibdrv_BlendImage, /* pBlendImage */
NULL, /* pChoosePixelFormat */
dibdrv_Chord, /* pChord */
NULL, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */
......@@ -447,7 +446,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_GetNearestColor, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
dibdrv_GetPixel, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -526,9 +524,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_DIB_DRV /* priority */
};
dlls/gdi32/driver.c
View file @ 6a9dcd51
......@@ -198,11 +198,6 @@ static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
return TRUE;
}
static INT nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr )
{
return 0;
}
static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -391,11 +386,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT
return 0;
}
static INT nulldrv_GetPixelFormat( PHYSDEV dev )
{
return 0;
}
static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries )
{
return 0;
......@@ -670,21 +660,6 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette )
return FALSE;
}
static HGLRC nulldrv_wglCreateContext( PHYSDEV dev )
{
return 0;
}
static HGLRC nulldrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC share_ctx, const int *attribs )
{
return 0;
}
static PROC nulldrv_wglGetProcAddress( LPCSTR name )
{
return NULL;
}
static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
{
return NULL;
......@@ -700,7 +675,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_ArcTo, /* pArcTo */
nulldrv_BeginPath, /* pBeginPath */
nulldrv_BlendImage, /* pBlendImage */
nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */
nulldrv_Chord, /* pChord */
nulldrv_CloseFigure, /* pCloseFigure */
nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -744,7 +718,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_GetNearestColor, /* pGetNearestColor */
nulldrv_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */
nulldrv_GetPixel, /* pGetPixel */
nulldrv_GetPixelFormat, /* pGetPixelFormat */
nulldrv_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */
nulldrv_GetTextCharsetInfo, /* pGetTextCharsetInfo */
nulldrv_GetTextExtentExPoint, /* pGetTextExtentExPoint */
......@@ -823,9 +796,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SwapBuffers, /* pSwapBuffers */
nulldrv_UnrealizePalette, /* pUnrealizePalette */
nulldrv_WidenPath, /* pWidenPath */
nulldrv_wglCreateContext, /* pwglCreateContext */
nulldrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
nulldrv_wglGetProcAddress, /* pwglGetProcAddress */
nulldrv_wine_get_wgl_driver, /* wine_get_wgl_driver */
GDI_PRIORITY_NULL_DRV /* priority */
......
dlls/gdi32/enhmfdrv/init.c
View file @ 6a9dcd51
......@@ -44,7 +44,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pArcTo */
EMFDRV_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
EMFDRV_Chord, /* pChord */
EMFDRV_CloseFigure, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */
......@@ -88,7 +87,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -167,9 +165,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
EMFDRV_WidenPath, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */
};
......
dlls/gdi32/freetype.c
View file @ 6a9dcd51
......@@ -7748,7 +7748,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */
......@@ -7792,7 +7791,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pGetNearestColor */
freetype_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */
freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */
......@@ -7871,9 +7869,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_FONT_DRV /* priority */
};
......
dlls/gdi32/mfdrv/init.c
View file @ 6a9dcd51
......@@ -107,7 +107,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pArcTo */
MFDRV_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
MFDRV_Chord, /* pChord */
MFDRV_CloseFigure, /* pCloseFigure */
MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -151,7 +150,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -230,9 +228,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
MFDRV_WidenPath, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */
};
......
dlls/gdi32/path.c
View file @ 6a9dcd51
......@@ -2241,7 +2241,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_ArcTo, /* pArcTo */
pathdrv_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
pathdrv_Chord, /* pChord */
pathdrv_CloseFigure, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */
......@@ -2285,7 +2284,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -2364,9 +2362,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_PATH_DRV /* priority */
};
dlls/wineps.drv/init.c
View file @ 6a9dcd51
......@@ -718,7 +718,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
PSDRV_Chord, /* pChord */
NULL, /* pCloseFigure */
PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -762,7 +761,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
PSDRV_GetTextExtentExPoint, /* pGetTextExtentExPoint */
......@@ -841,9 +839,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */
};
......
dlls/winex11.drv/init.c
View file @ 6a9dcd51
......@@ -447,15 +447,6 @@ static inline void opengl_error(void)
}
/***********************************************************************
* 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 )
......@@ -473,33 +464,6 @@ static BOOL X11DRV_SetPixelFormat( PHYSDEV dev, int fmt, const PIXELFORMATDESCRI
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;
}
static const struct gdi_dc_funcs x11drv_funcs =
{
......@@ -511,7 +475,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pBlendImage */
X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */
X11DRV_Chord, /* pChord */
NULL, /* pCloseFigure */
X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -555,7 +518,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_GetNearestColor, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -634,9 +596,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pSwapBuffers */
X11DRV_UnrealizePalette, /* pUnrealizePalette */
NULL, /* pWidenPath */
X11DRV_wglCreateContext, /* pwglCreateContext */
X11DRV_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
X11DRV_wglGetProcAddress, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */
};
......
dlls/winex11.drv/opengl.c
View file @ 6a9dcd51
......@@ -3458,7 +3458,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
glxdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -3502,7 +3501,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -3581,9 +3579,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
glxdrv_SwapBuffers, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */
};
......
dlls/winex11.drv/xrender.c
View file @ 6a9dcd51
......@@ -2474,7 +2474,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pArcTo */
NULL, /* pBeginPath */
xrenderdrv_BlendImage, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
......@@ -2518,7 +2517,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */
......@@ -2597,9 +2595,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */
};
......
include/wine/gdi_driver.h
View file @ 6a9dcd51
......@@ -70,7 +70,6 @@ struct gdi_dc_funcs
BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pBeginPath)(PHYSDEV);
DWORD (*pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION);
INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pCloseFigure)(PHYSDEV);
BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
......@@ -114,7 +113,6 @@ struct gdi_dc_funcs
COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF);
UINT (*pGetOutlineTextMetrics)(PHYSDEV,UINT,LPOUTLINETEXTMETRICW);
COLORREF (*pGetPixel)(PHYSDEV,INT,INT);
INT (*pGetPixelFormat)(PHYSDEV);
UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY);
UINT (*pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD);
BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE);
......@@ -193,9 +191,6 @@ struct gdi_dc_funcs
BOOL (*pSwapBuffers)(PHYSDEV);
BOOL (*pUnrealizePalette)(HPALETTE);
BOOL (*pWidenPath)(PHYSDEV);
HGLRC (*pwglCreateContext)(PHYSDEV);
HGLRC (*pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*);
PROC (*pwglGetProcAddress)(LPCSTR);
const struct wgl_funcs * (*wine_get_wgl_driver)(PHYSDEV,UINT);
/* priority order for the driver on the stack */
......@@ -203,7 +198,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 38
#define WINE_GDI_DRIVER_VERSION 39
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
......
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