diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-24 08:28:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:28:39 +0200 |
| commit | 0ebcd32e91486caccc041c8ca23e39e160b24702 (patch) | |
| tree | 50cd0bc17e8a587fdbecdf52be48fe8c59e222b9 /mesalib/src/mesa/main/teximage.c | |
| parent | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff) | |
| download | vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.tar.gz vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.tar.bz2 vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.zip | |
mesa pixman xserver git update 24 sep 2012
xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24
pixman: c4b69e706e63e01fbc70e0026c2079007c89de14
mesa: c432c86e6aeebeb46c028af940224c59faa16e88
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 83e79a5a3..08af66893 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -2746,7 +2746,7 @@ _mesa_choose_texture_format(struct gl_context *ctx, /* If the application requested compression to an S3TC format but we don't * have the DTXn library, force a generic compressed format instead. */ - if (internalFormat != format) { + if (internalFormat != format && format != GL_NONE) { const GLenum before = internalFormat; switch (internalFormat) { |