fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-16 10:00:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always allow use of native GL with overlay windows.

Browse source
This commit is contained in:
David Reveman 2006-09-25 11:25:16 -04:00
parent 2c7ac2d891
commit 526238a26d
1 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
hw/xgl/glxext/xglglxext.c
View file

@ -41,6 +41,7 @@
#include "glapitable.h"
#include "glxext.h"
#include "micmap.h"
#include "compint.h"
#define XGL_MAX_TEXTURE_UNITS 8
#define XGL_MAX_ATTRIB_STACK_DEPTH 16
@ -5611,6 +5612,7 @@ xglCreateDrawable (__GLXcontext *context,
ScreenPtr pScreen = pDrawable->pScreen;
xglGLBufferPtr pBufferPriv;
xglVisualPtr v;
Bool useMesa;
XGL_SCREEN_PRIV (pScreen);
XGL_DRAWABLE_PIXMAP (pDrawable);
@ -5687,25 +5689,56 @@ xglCreateDrawable (__GLXcontext *context,
pBufferPriv->pVisual = v;
}
if ((pDrawable->type == DRAWABLE_WINDOW)
useMesa = TRUE;
if (pDrawable->type == DRAWABLE_WINDOW)
{
#ifdef COMPOSITE
&& (pBufferPriv->pVisual
if (pBufferPriv->pVisual)
{
useMesa = FALSE;
}
else
{
WindowPtr pWin = (WindowPtr) pDrawable;
/* this is a root window, can't be redirected */
|| (!((WindowPtr) pDrawable)->parent))
if (!pWin->parent)
{
useMesa = FALSE;
}
else
{
CompScreenPtr cs = GetCompScreen (pScreen);
/* allow native GL with overlay windows */
for (; pWin; pWin = pWin->parent)
{
if (pWin == cs->pOverlayWin)
{
useMesa = FALSE;
break;
}
}
}
}
#else
useMesa = FALSE;
#endif
)
{
pBufferPriv->pDrawable = pDrawable;
}
else
if (useMesa)
{
pBufferPriv->mesaDrawable = (*mesaContext->createDrawable) (mesaContext,
pDrawable,
drawId);
}
else
{
pBufferPriv->pDrawable = pDrawable;
}
return &pBufferPriv->base;
}