summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2015-06-08 14:53:26 +0300
committerTapani Pälli <tapani.palli@intel.com>2015-06-10 12:59:50 +0300
commit07e4f12e66f64c8075c0d3fd1c23cbd7c657970c (patch)
tree994af36a1a901aab191bb44399215badb0a07dd7 /src/mesa/main
parentadee54f8269c5e9f4fde91d19f0e465afc8f14d8 (diff)
mesa: allow unsized formats GL_RG, GL_RED for GLES 3.0 with half float
v2: && -> ||, we enable on gles3 or if ARB_texture_rg is enabled Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90748 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/glformats.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 6a77c916a9..057a5d160b 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -1678,6 +1678,10 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
case GL_LUMINANCE:
case GL_ALPHA:
return GL_NO_ERROR;
+ case GL_RG:
+ case GL_RED:
+ if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_texture_rg)
+ return GL_NO_ERROR;
default:
return GL_INVALID_OPERATION;
}