diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
| commit | 528f5bd58a139174170c4130c67dca30193c9057 (patch) | |
| tree | 550c818095dbc607deaddf166c77116ccd91ef54 /mesalib/src/mesa/main/image.c | |
| parent | 2cfebffb491807a465a8e5f7daca582d8aefb829 (diff) | |
| download | vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.gz vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.bz2 vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.zip | |
xserver xkeyboard-config mesa git update 5 dec 2011
Diffstat (limited to 'mesalib/src/mesa/main/image.c')
| -rw-r--r-- | mesalib/src/mesa/main/image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c index 9b9e83802..b266e26c6 100644 --- a/mesalib/src/mesa/main/image.c +++ b/mesalib/src/mesa/main/image.c @@ -741,6 +741,7 @@ _mesa_is_color_format(GLenum format) case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT: case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT: case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: + case GL_ETC1_RGB8_OES: /* generic integer formats */ case GL_RED_INTEGER_EXT: case GL_GREEN_INTEGER_EXT: @@ -853,7 +854,6 @@ _mesa_is_stencil_format(GLenum format) { switch (format) { case GL_STENCIL_INDEX: - case GL_DEPTH_STENCIL: return GL_TRUE; default: return GL_FALSE; @@ -1051,6 +1051,8 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format) return ctx->Extensions.EXT_texture_compression_latc; case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: return ctx->Extensions.ATI_texture_compression_3dc; + case GL_ETC1_RGB8_OES: + return ctx->Extensions.OES_compressed_ETC1_RGB8_texture; #if FEATURE_ES case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: |