summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/image.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-03-18 13:44:51 +0100
committerMarek Olšák <maraeo@gmail.com>2011-03-29 12:04:55 +0200
commit0be369975fdfa79bcb702d0c13aa0a221055f61b (patch)
tree4ed36637e10ea45d61ba7458a5aa593bde7a57ff /src/mesa/main/image.c
parent47e3896dfd89a26abbe4ca2469c2480f3982b204 (diff)
downloadexternal_mesa3d-0be369975fdfa79bcb702d0c13aa0a221055f61b.zip
external_mesa3d-0be369975fdfa79bcb702d0c13aa0a221055f61b.tar.gz
external_mesa3d-0be369975fdfa79bcb702d0c13aa0a221055f61b.tar.bz2
mesa: initial EXT_texture_snorm support
The component ordering of some formats has been been reversed to match Gallium types.
Diffstat (limited to 'src/mesa/main/image.c')
-rw-r--r--src/mesa/main/image.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index bbde380..28841c2 100644
--- a/src/mesa/main/image.c
+++ b/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 */