diff options
author | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
commit | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (patch) | |
tree | 1804d7456ba8f200c7e329d4e6aa67ce4fb1649f /mesalib/src/mesa/drivers | |
parent | 88a78ebea08af461224f815a8380ea5c54186f43 (diff) | |
parent | 0402d388cb9803652c0f9a52ba7dcb6029fdd0b9 (diff) | |
download | vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.gz vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.bz2 vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 2b8b45bce..06d4337f8 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1871,7 +1871,8 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, * just going for the matching set of channels, in floating
* point.
*/
- if (ctx->Color.ClampFragmentColor != GL_TRUE)
+ if (ctx->Color.ClampFragmentColor != GL_TRUE &&
+ ctx->Extensions.ARB_texture_float)
texIntFormat = GL_RGBA32F;
}
else if (_mesa_is_stencil_format(format)) {
|