make xgl code at least build against latest glitz.
This commit is contained in:
parent
6e2086395d
commit
d822bc1596
|
@ -542,11 +542,6 @@ InitOutput (ScreenInfo *pScreenInfo,
|
|||
glitz_drawable_format_t *format, templ;
|
||||
int i, maj, min, count;
|
||||
unsigned long mask;
|
||||
unsigned long extraMask[] = {
|
||||
GLITZ_FORMAT_PBUFFER_MASK |
|
||||
GLITZ_FORMAT_DOUBLEBUFFER_MASK,
|
||||
0
|
||||
};
|
||||
|
||||
xglSetPixmapFormats (pScreenInfo);
|
||||
|
||||
|
@ -569,14 +564,8 @@ InitOutput (ScreenInfo *pScreenInfo,
|
|||
|
||||
mask = GLITZ_FORMAT_SAMPLES_MASK;
|
||||
|
||||
for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++)
|
||||
{
|
||||
format = glitz_egl_find_config (xdisplay, xscreen,
|
||||
mask | extraMask[i],
|
||||
&templ, 0);
|
||||
if (format)
|
||||
break;
|
||||
}
|
||||
format = glitz_egl_find_config (xdisplay, xscreen,
|
||||
mask, &templ, 0);
|
||||
|
||||
if (!format)
|
||||
FatalError ("no visual format found");
|
||||
|
|
|
@ -533,11 +533,6 @@ InitOutput (ScreenInfo *pScreenInfo,
|
|||
glitz_drawable_format_t *format, templ;
|
||||
int i;
|
||||
unsigned long mask;
|
||||
unsigned long extraMask[] = {
|
||||
GLITZ_FORMAT_PBUFFER_MASK |
|
||||
GLITZ_FORMAT_DOUBLEBUFFER_MASK,
|
||||
0
|
||||
};
|
||||
|
||||
xglSetPixmapFormats (pScreenInfo);
|
||||
|
||||
|
@ -556,14 +551,8 @@ InitOutput (ScreenInfo *pScreenInfo,
|
|||
|
||||
mask = GLITZ_FORMAT_SAMPLES_MASK;
|
||||
|
||||
for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++)
|
||||
{
|
||||
format = glitz_glx_find_drawable_format (xdisplay, xscreen,
|
||||
mask | extraMask[i],
|
||||
&templ, 0);
|
||||
if (format)
|
||||
break;
|
||||
}
|
||||
format = glitz_glx_find_window_format (xdisplay, xscreen,
|
||||
mask, &templ, 0);
|
||||
|
||||
if (!format)
|
||||
FatalError ("no visual format found");
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <X11/X.h>
|
||||
#define NEED_EVENTS
|
||||
|
|
|
@ -134,7 +134,7 @@ xglSetVisualTypesAndMasks (ScreenInfo *pScreenInfo,
|
|||
pPixelFormat = xglFindPixelFormat (format, visuals);
|
||||
if (pPixelFormat)
|
||||
{
|
||||
if (visuals && format->types.window)
|
||||
if (visuals)
|
||||
{
|
||||
xglVisuals = xrealloc (xglVisuals,
|
||||
(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++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -183,8 +183,7 @@ xglScreenInit (ScreenPtr pScreen,
|
|||
|
||||
glitz_surface_attach (pScreenPriv->surface,
|
||||
pScreenPriv->drawable,
|
||||
GLITZ_DRAWABLE_BUFFER_FRONT_COLOR,
|
||||
0, 0);
|
||||
GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
|
||||
|
||||
pScreenPriv->backSurface = NULL;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user