aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxdricommon.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-15 07:50:39 +0000
committermarha <marha@users.sourceforge.net>2010-04-15 07:50:39 +0000
commit6412df1b3df28c6213b43821c4a98cc3857d9a3f (patch)
treed26e725c65f2166ac78d4ee4e56176712a563483 /xorg-server/glx/glxdricommon.c
parentb71f397671d4b467bfac21f208d54d2dc507969c (diff)
downloadvcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.gz
vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.bz2
vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.zip
Git update 15/4/2010
Diffstat (limited to 'xorg-server/glx/glxdricommon.c')
-rw-r--r--xorg-server/glx/glxdricommon.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index faaa3b7ae..454aa5587 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -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;