fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-21 13:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "mesa: check for ARB_ES3_compatibility in format checks"

Browse source 
This reverts commit d5916cb3ca.

The GL_ARB_ES3_compatibility spec, says the following:

> Issues
>
>     1) OpenGL-ES 3.0 contains several features that have been deprecated from
>        the latest OpenGL Core specification. These were retained in OpenGL-ES
>        3.0 in order to provide backwards compatibility with OpenGL-ES 2.0. Those
>        features are:
>
> [snip]
>
>         * Legacy pixel formats - all ALPHA, LUMINANCE, LUMINANCE_ALPHA
>
> [snip]
>
>        Should we bring these features back into the OpenGL 4.x Core specification
>        so that it is a complete super-set of OpenGL-ES 3.0?
>
>        RESOLVED: No, these will not be brought back into OpenGL 4.x Core. Apps
>        written for OpenGL-ES 3.0 that want to also be compatible with OpenGL
>        should make sure they don't use these features.

So, it seems pretty clear that we shouldn't have included these formats
here. So let's remove them.

Turns out, this is a CTS bug, see this for more details:
https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/6191

Fixes: d5916cb3ca ("mesa: check for ARB_ES3_compatibility in format checks")
(cherry picked from commit b92719f926)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41540>
This commit is contained in:
Erik Faye-Lund 2025-11-26 12:49:08 +01:00 • committed by Eric Engestrom
parent df3a0e127f
commit cce6f08940
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -774,7 +774,7 @@
"description": "Revert \"mesa: check for ARB_ES3_compatibility in format checks\"",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d5916cb3ca7af90f81639d91922efecf9e713fda",
"notes": null

4
src/mesa/main/glformats.c
View file

@ -1821,9 +1821,7 @@ valid_texture_format_enum(const struct gl_context *ctx, GLenum format)
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE:
case GL_ALPHA:
return _mesa_is_desktop_gl_compat(ctx) ||
_mesa_has_ARB_ES3_compatibility(ctx) ||
_mesa_is_gles(ctx);
return _mesa_is_desktop_gl_compat(ctx) || _mesa_is_gles(ctx);
case GL_SRGB_EXT:
case GL_SRGB_ALPHA_EXT: