diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
| commit | 8654ee514b4d79feec936501717a06892090d3b7 (patch) | |
| tree | 2787608c117268bc6ed9e399ea57b8e1d0aeb8e3 /xorg-server/glx/glxdricommon.c | |
| parent | eb405babefc73e25ab8b7e6229709f85ef6a67b1 (diff) | |
| download | vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.gz vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.bz2 vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.zip | |
svn merge -r530:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/glx/glxdricommon.c')
| -rw-r--r-- | xorg-server/glx/glxdricommon.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c index 028c77842..a68566c07 100644 --- a/xorg-server/glx/glxdricommon.c +++ b/xorg-server/glx/glxdricommon.c @@ -129,7 +129,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; @@ -175,13 +175,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; @@ -191,7 +192,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; @@ -200,7 +202,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; |