diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
| commit | bd13c464f728719fceb8a4918b52727ec125ea6e (patch) | |
| tree | 05a48375076036097a9e28356738c05a16cc5ed0 /mesalib/src/mesa/main/glformats.c | |
| parent | bab6395ded69210cbc550c0fb3765160e4405283 (diff) | |
| parent | 0130346adbce7e6b2422429887fc46c76806d845 (diff) | |
| download | vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2 vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main/glformats.c')
| -rw-r--r-- | mesalib/src/mesa/main/glformats.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c index 04029c07c..ccdf56b4f 100644 --- a/mesalib/src/mesa/main/glformats.c +++ b/mesalib/src/mesa/main/glformats.c @@ -791,8 +791,10 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format) return ctx->Extensions.EXT_texture_compression_s3tc; case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return _mesa_is_desktop_gl(ctx) - && ctx->Extensions.EXT_texture_compression_s3tc; + return (_mesa_is_desktop_gl(ctx) && + ctx->Extensions.EXT_texture_compression_s3tc) || + (ctx->API == API_OPENGLES2 && + ctx->Extensions.ANGLE_texture_compression_dxt); case GL_RGB_S3TC: case GL_RGB4_S3TC: case GL_RGBA_S3TC: |