summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/glformats.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-07-30 02:48:37 +0100
committerDave Airlie <airlied@redhat.com>2015-09-02 09:26:34 +1000
commitc3c242070e868225a81e1afe5fb424c33eb94c2f (patch)
tree702295029e226347b07f36777b5311e0a7bde576 /src/mesa/main/glformats.c
parent8185a02316cfb7dc3d64b8772af82ad2bb49754e (diff)
downloadexternal_mesa3d-c3c242070e868225a81e1afe5fb424c33eb94c2f.zip
external_mesa3d-c3c242070e868225a81e1afe5fb424c33eb94c2f.tar.gz
external_mesa3d-c3c242070e868225a81e1afe5fb424c33eb94c2f.tar.bz2
mesa/formats: 8-bit channel integer formats addition
Add enough 8-bit channel formats to handle all the different things CTS throws at us. Cc: "11.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mesa/main/glformats.c')
-rw-r--r--src/mesa/main/glformats.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 18d0869..c1d3c7d 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2916,6 +2916,10 @@ _mesa_format_from_format_and_type(GLenum format, GLenum type)
return MESA_FORMAT_A8R8G8B8_UNORM;
else if (format == GL_ABGR_EXT)
return MESA_FORMAT_R8G8B8A8_UNORM;
+ else if (format == GL_RGBA_INTEGER)
+ return MESA_FORMAT_A8B8G8R8_UINT;
+ else if (format == GL_BGRA_INTEGER)
+ return MESA_FORMAT_A8R8G8B8_UINT;
break;
case GL_UNSIGNED_INT_8_8_8_8_REV:
if (format == GL_RGBA)
@@ -2924,6 +2928,10 @@ _mesa_format_from_format_and_type(GLenum format, GLenum type)
return MESA_FORMAT_B8G8R8A8_UNORM;
else if (format == GL_ABGR_EXT)
return MESA_FORMAT_A8B8G8R8_UNORM;
+ else if (format == GL_RGBA_INTEGER)
+ return MESA_FORMAT_R8G8B8A8_UINT;
+ else if (format == GL_BGRA_INTEGER)
+ return MESA_FORMAT_B8G8R8A8_UINT;
break;
case GL_UNSIGNED_SHORT_8_8_MESA:
if (format == GL_YCBCR_MESA)