diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2021-03-12 14:25:09 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-12 21:40:04 +0000 |
| commit | a04a797b89b328c254d7810c8748f4ca7684d5b6 (patch) | |
| tree | ba74d39c1afdc0439f420203fbc767cf4b87fcc6 /src/mesa/main/fbobject.c | |
| parent | 87c85139ea316c1df6127a6feb6fdd92cc3ff986 (diff) | |
mesa: only report INCOMPLETE_FORMATS for GLES1 / desktop
The enum is defined in EXT_framebuffer_object (available on desktop),
and was copied to OES_framebuffer_object (available in GLES1). The ES2
spec has no mention of such an enum. If the underlying implementation
does not support this, it will set a generic incomplete error (as is
done in st_cb_fbo.c if mixed_formats == false).
This should fix the following dEQP tests on ES2 drivers:
dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_tex_none_none
dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_rbo_none_none
Fixes: fd017458bc84 (mesa: fix fbo attachment size check for RBs, make it trigger in ES2)
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4444
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9572>
Diffstat (limited to 'src/mesa/main/fbobject.c')
| -rw-r--r-- | src/mesa/main/fbobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 5f3fa50a076..212feb4fe68 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -1314,7 +1314,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, return; } /* check that all color buffers are the same format */ - if (intFormat != GL_NONE && f != intFormat) { + if (ctx->API != API_OPENGLES2 && intFormat != GL_NONE && f != intFormat) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT; fbo_incomplete(ctx, "format mismatch", -1); return; |