frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make xgl code at least build against latest glitz.

This commit is contained in:
Dave Airlie 2005-12-23 00:08:35 +00:00
parent 6e2086395d
commit d822bc1596
5 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xgl/egl/xegl.c
View File

@ -542,11 +542,6 @@ InitOutput (ScreenInfo *pScreenInfo,
glitz_drawable_format_t *format, templ; glitz_drawable_format_t *format, templ;
int i, maj, min, count; int i, maj, min, count;
unsigned long mask; unsigned long mask;
unsigned long extraMask[] = {
GLITZ_FORMAT_PBUFFER_MASK |
GLITZ_FORMAT_DOUBLEBUFFER_MASK,
0
};
xglSetPixmapFormats (pScreenInfo); xglSetPixmapFormats (pScreenInfo);
@ -569,14 +564,8 @@ InitOutput (ScreenInfo *pScreenInfo,
mask = GLITZ_FORMAT_SAMPLES_MASK; mask = GLITZ_FORMAT_SAMPLES_MASK;
for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++) format = glitz_egl_find_config (xdisplay, xscreen,
{ mask, &templ, 0);
format = glitz_egl_find_config (xdisplay, xscreen,
mask | extraMask[i],
&templ, 0);
if (format)
break;
}
if (!format) if (!format)
FatalError ("no visual format found"); FatalError ("no visual format found");

15
hw/xgl/glx/xglx.c
View File

@ -533,11 +533,6 @@ InitOutput (ScreenInfo *pScreenInfo,
glitz_drawable_format_t *format, templ; glitz_drawable_format_t *format, templ;
int i; int i;
unsigned long mask; unsigned long mask;
unsigned long extraMask[] = {
GLITZ_FORMAT_PBUFFER_MASK |
GLITZ_FORMAT_DOUBLEBUFFER_MASK,
0
};
xglSetPixmapFormats (pScreenInfo); xglSetPixmapFormats (pScreenInfo);
@ -556,14 +551,8 @@ InitOutput (ScreenInfo *pScreenInfo,
mask = GLITZ_FORMAT_SAMPLES_MASK; mask = GLITZ_FORMAT_SAMPLES_MASK;
for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++) format = glitz_glx_find_window_format (xdisplay, xscreen,
{ mask, &templ, 0);
format = glitz_glx_find_drawable_format (xdisplay, xscreen,
mask | extraMask[i],
&templ, 0);
if (format)
break;
}
if (!format) if (!format)
FatalError ("no visual format found"); FatalError ("no visual format found");

1
hw/xgl/xgl.h
View File

@ -30,6 +30,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <X11/X.h> #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS

16
hw/xgl/xglcmap.c
View File

@ -134,7 +134,7 @@ xglSetVisualTypesAndMasks (ScreenInfo *pScreenInfo,
pPixelFormat = xglFindPixelFormat (format, visuals); pPixelFormat = xglFindPixelFormat (format, visuals);
if (pPixelFormat) if (pPixelFormat)
{ {
if (visuals && format->types.window) if (visuals)
{ {
xglVisuals = xrealloc (xglVisuals, xglVisuals = xrealloc (xglVisuals,
(nxglVisuals + 1) * sizeof (xglVisualRec)); (nxglVisuals + 1) * sizeof (xglVisualRec));
@ -148,20 +148,6 @@ xglSetVisualTypesAndMasks (ScreenInfo *pScreenInfo,
} }
} }
if (format->types.pbuffer)
{
xglPbufferVisuals =
xrealloc (xglPbufferVisuals,
(nxglPbufferVisuals + 1) * sizeof (xglVisualRec));
if (xglPbufferVisuals)
{
xglPbufferVisuals[nxglPbufferVisuals].format = format;
xglPbufferVisuals[nxglPbufferVisuals].pPixel = NULL;
xglPbufferVisuals[nxglPbufferVisuals].visuals = 0;
nxglPbufferVisuals++;
}
}
} }
} }

3
hw/xgl/xglscreen.c
View File

@ -183,8 +183,7 @@ xglScreenInit (ScreenPtr pScreen,
glitz_surface_attach (pScreenPriv->surface, glitz_surface_attach (pScreenPriv->surface,
pScreenPriv->drawable, pScreenPriv->drawable,
GLITZ_DRAWABLE_BUFFER_FRONT_COLOR, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
0, 0);
pScreenPriv->backSurface = NULL; pScreenPriv->backSurface = NULL;