diff options
| author | Dave Airlie <[email protected]> | 2011-11-27 17:16:27 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-11-28 09:03:17 +0000 |
| commit | 47e2e367170edec022481f1487cd980e00ef3203 (patch) | |
| tree | 5f01826caad571b162e97566e8d8567ce491d988 /src/mesa | |
| parent | 537c687116870c0ec9dd0fa869b29dc6725e1c37 (diff) | |
image/pack: fix missing GL_BGR(A)_INTEGER support.
These codepaths were missing the cases for BGR_INTEGER/BGRA_INTEGER.
Signed-off-by: Dave Airlie <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/image.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/pack.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index ca31e53a8cf..72e944e11ac 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -243,12 +243,14 @@ _mesa_components_in_format( GLenum format ) case GL_RGB: case GL_BGR: case GL_RGB_INTEGER_EXT: + case GL_BGR_INTEGER_EXT: return 3; case GL_RGBA: case GL_BGRA: case GL_ABGR_EXT: case GL_RGBA_INTEGER_EXT: + case GL_BGRA_INTEGER_EXT: return 4; default: diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index bd8503168fb..4754d34c646 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -2291,6 +2291,7 @@ get_component_mapping(GLenum format, *aDst = 3; break; case GL_BGR: + case GL_BGR_INTEGER: *rSrc = 2; *gSrc = 1; *bSrc = 0; @@ -2312,6 +2313,7 @@ get_component_mapping(GLenum format, *aDst = 3; break; case GL_BGRA: + case GL_BGRA_INTEGER: *rSrc = 2; *gSrc = 1; *bSrc = 0; |