ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed OpenGL routines broken by the DC -> PHYSDEV change.

This commit is contained in:
Michael Karcher 2002-04-08 22:43:58 +00:00 committed by Alexandre Julliard
parent b1f478fada
commit ea9cf5c531
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/x11drv/opengl.c
View File

@ -84,20 +84,19 @@ static void dump_PIXELFORMATDESCRIPTOR(PIXELFORMATDESCRIPTOR *ppfd) {
Equivalent of glXChooseVisual Equivalent of glXChooseVisual
*/ */
int X11DRV_ChoosePixelFormat(DC *dc, int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev,
const PIXELFORMATDESCRIPTOR *ppfd) { const PIXELFORMATDESCRIPTOR *ppfd) {
#define TEST_AND_ADD1(t,a) if (t) att_list[att_pos++] = a #define TEST_AND_ADD1(t,a) if (t) att_list[att_pos++] = a
#define TEST_AND_ADD2(t,a,b) if (t) { att_list[att_pos++] = a; att_list[att_pos++] = b; } #define TEST_AND_ADD2(t,a,b) if (t) { att_list[att_pos++] = a; att_list[att_pos++] = b; }
#define NULL_TEST_AND_ADD2(tv,a,b) att_list[att_pos++] = a; att_list[att_pos++] = ((tv) == 0 ? 0 : b) #define NULL_TEST_AND_ADD2(tv,a,b) att_list[att_pos++] = a; att_list[att_pos++] = ((tv) == 0 ? 0 : b)
#define ADD2(a,b) att_list[att_pos++] = a; att_list[att_pos++] = b #define ADD2(a,b) att_list[att_pos++] = a; att_list[att_pos++] = b
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
int att_list[64]; int att_list[64];
int att_pos = 0; int att_pos = 0;
XVisualInfo *vis; XVisualInfo *vis;
if (TRACE_ON(opengl)) { if (TRACE_ON(opengl)) {
TRACE("(%p,%p)\n", dc, ppfd); TRACE("(%p,%p)\n", physDev, ppfd);
dump_PIXELFORMATDESCRIPTOR((PIXELFORMATDESCRIPTOR *) ppfd); dump_PIXELFORMATDESCRIPTOR((PIXELFORMATDESCRIPTOR *) ppfd);
} }
@ -162,16 +161,15 @@ int X11DRV_ChoosePixelFormat(DC *dc,
Get the pixel-format descriptor associated to the given id Get the pixel-format descriptor associated to the given id
*/ */
int X11DRV_DescribePixelFormat(DC *dc, int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
int iPixelFormat, int iPixelFormat,
UINT nBytes, UINT nBytes,
PIXELFORMATDESCRIPTOR *ppfd) { PIXELFORMATDESCRIPTOR *ppfd) {
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
XVisualInfo *vis; XVisualInfo *vis;
int value; int value;
int rb,gb,bb,ab; int rb,gb,bb,ab;
TRACE("(%p,%d,%d,%p)\n", dc, iPixelFormat, nBytes, ppfd); TRACE("(%p,%d,%d,%p)\n", physDev, iPixelFormat, nBytes, ppfd);
if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) { if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) {
ERR("Wrong structure size !\n"); ERR("Wrong structure size !\n");
@ -275,10 +273,8 @@ int X11DRV_DescribePixelFormat(DC *dc,
Get the pixel-format id used by this DC Get the pixel-format id used by this DC
*/ */
int X11DRV_GetPixelFormat(DC *dc) { int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev) {
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev; TRACE("(%p): returns %d\n", physDev, physDev->current_pf);
TRACE("(%p): returns %d\n", dc, physDev->current_pf);
return physDev->current_pf; return physDev->current_pf;
} }
@ -287,12 +283,10 @@ int X11DRV_GetPixelFormat(DC *dc) {
Set the pixel-format id used by this DC Set the pixel-format id used by this DC
*/ */
BOOL X11DRV_SetPixelFormat(DC *dc, BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev,
int iPixelFormat, int iPixelFormat,
const PIXELFORMATDESCRIPTOR *ppfd) { const PIXELFORMATDESCRIPTOR *ppfd) {
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev; TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd);
TRACE("(%p,%d,%p)\n", dc, iPixelFormat, ppfd);
physDev->current_pf = iPixelFormat; physDev->current_pf = iPixelFormat;
@ -303,10 +297,8 @@ BOOL X11DRV_SetPixelFormat(DC *dc,
Swap the buffers of this DC Swap the buffers of this DC
*/ */
BOOL X11DRV_SwapBuffers(DC *dc) { BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) {
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev; TRACE("(%p)\n", physDev);
TRACE("(%p)\n", dc);
ENTER_GL(); ENTER_GL();
glXSwapBuffers(gdi_display, physDev->drawable); glXSwapBuffers(gdi_display, physDev->drawable);

12
include/x11drv.h
View File

@ -176,11 +176,13 @@ extern BOOL X11DRV_GetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
extern BOOL X11DRV_SetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp ); extern BOOL X11DRV_SetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
/* OpenGL / X11 driver functions */ /* OpenGL / X11 driver functions */
extern int X11DRV_ChoosePixelFormat(DC *dc, const PIXELFORMATDESCRIPTOR *pppfd) ; extern int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev,
extern int X11DRV_DescribePixelFormat(DC *dc, int iPixelFormat, UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) ; const PIXELFORMATDESCRIPTOR *pppfd);
extern int X11DRV_GetPixelFormat(DC *dc) ; extern int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
extern BOOL X11DRV_SetPixelFormat(DC *dc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) ; int iPixelFormat, UINT nBytes,
extern BOOL X11DRV_SwapBuffers(DC *dc) ; PIXELFORMATDESCRIPTOR *ppfd);
extern int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev);
extern BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev);
/* X11 driver internal functions */ /* X11 driver internal functions */