Module: Mesa Branch: staging/21.2 Commit: e08581fd73d501b46aef3cb72261030a9abcbe4a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e08581fd73d501b46aef3cb72261030a9abcbe4a
Author: Emma Anholt <[email protected]> Date: Mon Sep 20 11:31:32 2021 -0700 mesa: Fix missing CopyTexImage formats for OES_required_internalformat. All our GLES2-only divers were failing these KHR tests because we were missing new OES_required_internalformat internalformats for CopyTexImage. Cc: mesa-stable Reviewed-by: Juan A. Suarez <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12962> (cherry picked from commit e470d9fae5d98d66c754bae6c3e5d199f8ce1fdb) --- .pick_status.json | 2 +- src/broadcom/ci/deqp-vc4-rpi3-fails.txt | 7 ------- src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt | 2 ++ src/mesa/main/teximage.c | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 31fb1b22f2e..0a1d8765536 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -436,7 +436,7 @@ "description": "mesa: Fix missing CopyTexImage formats for OES_required_internalformat.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/broadcom/ci/deqp-vc4-rpi3-fails.txt b/src/broadcom/ci/deqp-vc4-rpi3-fails.txt index 9ee0afd8e68..c8050ec4b93 100644 --- a/src/broadcom/ci/deqp-vc4-rpi3-fails.txt +++ b/src/broadcom/ci/deqp-vc4-rpi3-fails.txt @@ -1,10 +1,3 @@ -KHR-GLES2.core.internalformat.copy_tex_image.alpha8_oes,Fail -KHR-GLES2.core.internalformat.copy_tex_image.luminance4_alpha4_oes,Fail -KHR-GLES2.core.internalformat.copy_tex_image.luminance8_alpha8_oes,Fail -KHR-GLES2.core.internalformat.copy_tex_image.luminance8_oes,Fail -KHR-GLES2.core.internalformat.copy_tex_image.rgb565,Fail -KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1,Fail -KHR-GLES2.core.internalformat.copy_tex_image.rgba4,Fail KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component16,Fail KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component24,Fail KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_short_depth_component16,Fail 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 43822f6cb5c..019f00642b4 100644 --- a/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt @@ -665,6 +665,8 @@ KHR-GLES2.core.internalformat.copy_tex_image.rgb10_a2,Fail KHR-GLES2.core.internalformat.copy_tex_image.rgb565,Fail KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1,Fail KHR-GLES2.core.internalformat.copy_tex_image.rgba4,Fail + +# depth texture is sampling as as white instead of red. KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component16,Fail KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component24,Fail KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_short_depth_component16,Fail diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 71c5f2b299f..97ca0553780 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -2346,7 +2346,25 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, case GL_RGBA: case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: + + /* Added by GL_OES_required_internalformat (always enabled) in table 3.4.y.*/ + case GL_ALPHA8: + case GL_LUMINANCE8: + case GL_LUMINANCE8_ALPHA8: + case GL_LUMINANCE4_ALPHA4: + case GL_RGB565: + case GL_RGB8: + case GL_RGBA4: + case GL_RGB5_A1: + case GL_RGBA8: + case GL_DEPTH_COMPONENT16: + case GL_DEPTH_COMPONENT24: + case GL_DEPTH_COMPONENT32: + case GL_DEPTH24_STENCIL8: + case GL_RGB10: + case GL_RGB10_A2: break; + default: _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage%dD(internalFormat=%s)", dimensions,
