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/image.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/image.c')
| -rw-r--r-- | mesalib/src/mesa/main/image.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c index bbde3800e..28841c251 100644 --- a/mesalib/src/mesa/main/image.c +++ b/mesalib/src/mesa/main/image.c @@ -748,9 +748,6 @@ _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: - /* signed, normalized texture formats */ - case GL_RGBA_SNORM: - case GL_RGBA8_SNORM: /* generic integer formats */ case GL_RED_INTEGER_EXT: case GL_GREEN_INTEGER_EXT: @@ -799,6 +796,31 @@ _mesa_is_color_format(GLenum format) case GL_INTENSITY8I_EXT: case GL_LUMINANCE8I_EXT: case GL_LUMINANCE_ALPHA8I_EXT: + /* signed, normalized texture formats */ + case GL_RED_SNORM: + case GL_R8_SNORM: + case GL_R16_SNORM: + case GL_RG_SNORM: + case GL_RG8_SNORM: + case GL_RG16_SNORM: + case GL_RGB_SNORM: + case GL_RGB8_SNORM: + case GL_RGB16_SNORM: + case GL_RGBA_SNORM: + case GL_RGBA8_SNORM: + case GL_RGBA16_SNORM: + case GL_ALPHA_SNORM: + case GL_ALPHA8_SNORM: + case GL_ALPHA16_SNORM: + case GL_LUMINANCE_SNORM: + case GL_LUMINANCE8_SNORM: + case GL_LUMINANCE16_SNORM: + case GL_LUMINANCE_ALPHA_SNORM: + case GL_LUMINANCE8_ALPHA8_SNORM: + case GL_LUMINANCE16_ALPHA16_SNORM: + case GL_INTENSITY_SNORM: + case GL_INTENSITY8_SNORM: + case GL_INTENSITY16_SNORM: return GL_TRUE; case GL_YCBCR_MESA: /* not considered to be RGB */ /* fall-through */ |