Mesa (main): mesa: rgb10_a2 is never color-renderable in gles2

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7fbb773c0db664b010ce81d6ee0be01715b45aaf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7fbb773c0db664b010ce81d6ee0be01715b45aaf

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Aug 18 23:14:12 2021 -0400

mesa: rgb10_a2 is never color-renderable in gles2

Fixes
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb10_a2 on
GLES2 drivers which support RGB10_A2 textures.
GL_OES_required_internalformat does not make it a color-renderable
format.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4972
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12464>

---

 src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt | 4 ----
 src/mesa/main/fbobject.c                            | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt
index c3ba1950377..a4622a5e463 100644
--- a/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt
@@ -26,10 +26,6 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4972
-# Looks like a testcase bug
-dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb10_a2,Fail
-
 # " // GL_INVALID_OPERATION returned
 #   // ERROR: expected GL_INVALID_VALUE"
 # Mesa: User error: GL_INVALID_OPERATION in glUniformMatrix(non-matrix uniform)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 49893165250..f9797ba6fc4 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -802,6 +802,8 @@ is_format_color_renderable(const struct gl_context *ctx, mesa_format format,
       return _mesa_has_EXT_color_buffer_float(ctx);
    case GL_RGB16F:
       return _mesa_has_EXT_color_buffer_half_float(ctx);
+   case GL_RGB10_A2:
+      return _mesa_is_gles3(ctx);
    case GL_RGB32F:
    case GL_RGB32I:
    case GL_RGB32UI: