diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
| commit | 0130346adbce7e6b2422429887fc46c76806d845 (patch) | |
| tree | 1b88028d42d79ab8062581d361a720b04a87fbc0 /mesalib/src/mesa/main/glformats.c | |
| parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
| download | vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.gz vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.bz2 vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.zip | |
randrproto mesa pixman git update 4 oct 2012
randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455
mesa: 185d6df3c10a7ff5defe163af614bfc41088910b
pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
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: |