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

glx: Set the pbuffer bit for dri2 fbconfigs 

They've been implemented for a while, but we never advertised them.  All we
need to do is set the GLX_PBUFFER_BIT in the drawable type fbconfig
field when we're using DRI2.

https://bugs.freedesktop.org/show_bug.cgi?id=26581

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Kristian Høgsberg 2010-04-09 10:58:48 -04:00 committed by Keith Packard
parent ab60975fe2
commit 1760d2bef9
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glx/glxdri.c
View File

@ -35,6 +35,7 @@
#include <drm.h>
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
#include <GL/glxtokens.h>
#include <windowstr.h>
#include <os.h>
@ -939,9 +940,6 @@ initializeExtensions(__GLXDRIscreen *screen)
}
}
extern __GLXconfig *
glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs);
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
{
@ -1131,7 +1129,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
goto handle_error;
}
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
screen->base.fbconfigs = glxConvertConfigs(screen->core,
driConfigs, GLX_WINDOW_BIT);
initializeExtensions(screen);

5
glx/glxdri2.c
View File

@ -748,7 +748,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
initializeExtensions(screen);
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs,
GLX_WINDOW_BIT |
GLX_PIXMAP_BIT |
GLX_PBUFFER_BIT);
__glXScreenInit(&screen->base, pScreen);

13
glx/glxdricommon.c
View File

@ -121,7 +121,7 @@ setScalar(__GLXconfig *config, unsigned int attrib, unsigned int value)
static __GLXconfig *
createModeFromConfig(const __DRIcoreExtension *core,
const __DRIconfig *driConfig,
unsigned int visualType)
unsigned int visualType, unsigned int drawableType)
{
__GLXDRIconfig *config;
unsigned int attrib, value;
@ -167,13 +167,14 @@ createModeFromConfig(const __DRIcoreExtension *core,
config->config.next = NULL;
config->config.xRenderable = GL_TRUE;
config->config.visualType = visualType;
config->config.drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT;
config->config.drawableType = drawableType;
return &config->config;
}
__GLXconfig *
glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs)
glxConvertConfigs(const __DRIcoreExtension *core,
const __DRIconfig **configs, unsigned int drawableType)
{
__GLXconfig head, *tail;
int i;
@ -183,7 +184,8 @@ glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs)
for (i = 0; configs[i]; i++) {
tail->next = createModeFromConfig(core,
configs[i], GLX_TRUE_COLOR);
configs[i], GLX_TRUE_COLOR,
drawableType);
if (tail->next == NULL)
break;
@ -192,7 +194,8 @@ glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs)
for (i = 0; configs[i]; i++) {
tail->next = createModeFromConfig(core,
configs[i], GLX_DIRECT_COLOR);
configs[i], GLX_DIRECT_COLOR,
drawableType);
if (tail->next == NULL)
break;

3
glx/glxdricommon.h
View File

@ -33,7 +33,8 @@ struct __GLXDRIconfig {
};
__GLXconfig *
glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs);
glxConvertConfigs(const __DRIcoreExtension *core,
const __DRIconfig **configs, unsigned int drawableType);
extern const __DRIsystemTimeExtension systemTimeExtension;

5
glx/glxdriswrast.c
View File

@ -506,7 +506,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
initializeExtensions(screen);
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs,
GLX_WINDOW_BIT |
GLX_PIXMAP_BIT |
GLX_PBUFFER_BIT);
__glXScreenInit(&screen->base, pScreen);