diff options
| author | Eric Anholt <eric@anholt.net> | 2011-11-04 15:12:30 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-11-15 16:23:56 -0800 |
| commit | 2bf9aeaa19f75816c6342fe564ad7c4bcdc97e12 (patch) | |
| tree | 5289611c75dcabd0b9e3131d2744bb9c9a833738 /src/mesa/main/image.c | |
| parent | 79653c12d6da4d89aaa73e4e8260a84d91f93593 (diff) | |
| download | external_mesa3d-2bf9aeaa19f75816c6342fe564ad7c4bcdc97e12.zip external_mesa3d-2bf9aeaa19f75816c6342fe564ad7c4bcdc97e12.tar.gz external_mesa3d-2bf9aeaa19f75816c6342fe564ad7c4bcdc97e12.tar.bz2 | |
mesa: Include R/RG integer textures in _mesa_is_integer_format.
Fixes some spurious GL errors in the upcoming
gl-3.0-required-sized-formats piglit test.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index fdb4b31..914a999 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -952,36 +952,48 @@ _mesa_is_integer_format(GLenum format) /* specific integer formats */ case GL_RGBA32UI_EXT: case GL_RGB32UI_EXT: + case GL_RG32UI: + case GL_R32UI: case GL_ALPHA32UI_EXT: case GL_INTENSITY32UI_EXT: case GL_LUMINANCE32UI_EXT: case GL_LUMINANCE_ALPHA32UI_EXT: case GL_RGBA16UI_EXT: case GL_RGB16UI_EXT: + case GL_RG16UI: + case GL_R16UI: case GL_ALPHA16UI_EXT: case GL_INTENSITY16UI_EXT: case GL_LUMINANCE16UI_EXT: case GL_LUMINANCE_ALPHA16UI_EXT: case GL_RGBA8UI_EXT: case GL_RGB8UI_EXT: + case GL_RG8UI: + case GL_R8UI: case GL_ALPHA8UI_EXT: case GL_INTENSITY8UI_EXT: case GL_LUMINANCE8UI_EXT: case GL_LUMINANCE_ALPHA8UI_EXT: case GL_RGBA32I_EXT: case GL_RGB32I_EXT: + case GL_RG32I: + case GL_R32I: case GL_ALPHA32I_EXT: case GL_INTENSITY32I_EXT: case GL_LUMINANCE32I_EXT: case GL_LUMINANCE_ALPHA32I_EXT: case GL_RGBA16I_EXT: case GL_RGB16I_EXT: + case GL_RG16I: + case GL_R16I: case GL_ALPHA16I_EXT: case GL_INTENSITY16I_EXT: case GL_LUMINANCE16I_EXT: case GL_LUMINANCE_ALPHA16I_EXT: case GL_RGBA8I_EXT: case GL_RGB8I_EXT: + case GL_RG8I: + case GL_R8I: case GL_ALPHA8I_EXT: case GL_INTENSITY8I_EXT: case GL_LUMINANCE8I_EXT: |