OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: check for ARB_ES3_compatibility in format checks

Browse Source 
Fixes regressions seen with following tests:

 dEQP-GL45-ES3.functional.negative_api.buffer.read_pixels
 dEQP-GL45-ES3.functional.negative_api.buffer.read_pixels_format_mismatch
 dEQP-GL45-ES31.functional.debug.negative_coverage.get_error.buffer.read_pixels
 dEQP-GL45-ES31.functional.debug.negative_coverage.get_error.buffer.readn_pixels
 dEQP-GL45-ES31.functional.debug.negative_coverage.get_error.buffer.read_pixels_format_mismatch

Fixes: e8226bda60 ("mesa/main: validate desktop gl format/types")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31008>
This commit is contained in:
Tapani Pälli
2024-09-04 09:26:00 +03:00
committed by Marge Bot
parent e6c2bf38b1
commit d5916cb3ca
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1788,7 +1788,9 @@ 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_is_gles(ctx);
return _mesa_is_desktop_gl_compat(ctx) ||
_mesa_has_ARB_ES3_compatibility(ctx) ||
_mesa_is_gles(ctx);
case GL_ABGR_EXT:
return _mesa_has_EXT_abgr(ctx);