diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-30 06:43:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-30 06:43:04 +0000 |
| commit | 2039567395da75a3ae318fb82738cdcf2caa05a1 (patch) | |
| tree | 23caaf9e0f6867d85f5cffc284d008c591ae99cb /mesalib/src/mesa/main/teximage.c | |
| parent | 24abc56b37a3ec32a03b7eafccd96607ae13ea89 (diff) | |
| download | vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.tar.gz vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.tar.bz2 vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.zip | |
mesa git update 30 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index c6b8c05b1..86927d3b6 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -311,11 +311,40 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - if (ctx->Extensions.MESA_texture_signed_rgba) { + if (ctx->Extensions.EXT_texture_snorm) { switch (internalFormat) { + case GL_RED_SNORM: + case GL_R8_SNORM: + case GL_R16_SNORM: + return GL_RED; + case GL_RG_SNORM: + case GL_RG8_SNORM: + case GL_RG16_SNORM: + return GL_RG; + case GL_RGB_SNORM: + case GL_RGB8_SNORM: + case GL_RGB16_SNORM: + return GL_RGB; case GL_RGBA_SNORM: case GL_RGBA8_SNORM: + case GL_RGBA16_SNORM: return GL_RGBA; + case GL_ALPHA_SNORM: + case GL_ALPHA8_SNORM: + case GL_ALPHA16_SNORM: + return GL_ALPHA; + case GL_LUMINANCE_SNORM: + case GL_LUMINANCE8_SNORM: + case GL_LUMINANCE16_SNORM: + return GL_LUMINANCE; + case GL_LUMINANCE_ALPHA_SNORM: + case GL_LUMINANCE8_ALPHA8_SNORM: + case GL_LUMINANCE16_ALPHA16_SNORM: + return GL_LUMINANCE_ALPHA; + case GL_INTENSITY_SNORM: + case GL_INTENSITY8_SNORM: + case GL_INTENSITY16_SNORM: + return GL_INTENSITY; default: ; /* fallthrough */ } |