diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /mesalib/src/mesa/main/teximage.c | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 24a551061..31a559e9d 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -190,7 +190,9 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - if (ctx->Extensions.EXT_texture_compression_s3tc) { + /* Assume that the ANGLE flag will always be set if the EXT flag is set. + */ + if (ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return GL_RGB; @@ -203,19 +205,8 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - /* GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE && GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE */ - if (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt) { - switch (internalFormat) { - case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return GL_RGBA; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.S3_s3tc) { + if (_mesa_is_desktop_gl(ctx) + && ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { case GL_RGB_S3TC: case GL_RGB4_S3TC: |