summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-04-24 19:38:03 -0700
committerJordan Justen <jordan.l.justen@intel.com>2016-04-25 12:09:15 -0700
commit50b82ecd772ff8f59974618f852fedf98bbe77a6 (patch)
treeff10e52bac47fc5a48fe8d3a2c2770bd622cd0e1
parentc4cb879f00de89c300462e7b2d0f221d920c396f (diff)
mesa/gles: Allow format GL_RED to be used with MESA_FORMAT_R_UNORM
If the bound framebuffer has a format of MESA_FORMAT_R_UNORM, then IMPLEMENTATION_COLOR_READ_FORMAT will return GL_RED. This change applies to OpenGLES contexts where additional restrictions are placed on the formats that are allowed to be supported. Fixes OpenGLES 3.1 CTS tests: * ES31-CTS.texture_border_clamp.sampling_texture.Texture2DDC16 * ES31-CTS.texture_border_clamp.sampling_texture.Texture2DDC16Linear * ES31-CTS.texture_border_clamp.sampling_texture.Texture2DDC32F * ES31-CTS.texture_border_clamp.sampling_texture.Texture2DDC32FLinear Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/main/framebuffer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index f69dc6cb3e6..38bd6806056 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -858,6 +858,8 @@ _mesa_get_color_read_format(struct gl_context *ctx)
return GL_BGRA;
else if (format == MESA_FORMAT_B5G6R5_UNORM)
return GL_BGR;
+ else if (format == MESA_FORMAT_R_UNORM8)
+ return GL_RED;
switch (data_type) {
case GL_UNSIGNED_INT: