fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-16 17:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix fbo attachment size check for RBs, make it trigger in ES2

Browse source 
Makes dEQP-GLES2.functional.fbo.completeness.size.distinct pass.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9441>
This commit is contained in:
Ilia Mirkin 2021-03-05 18:33:57 -05:00 • committed by Marge Bot
parent a8044e87e7
commit fd017458bc
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/broadcom/ci/deqp-vc4-rpi3-fails.txt
View file

@ -3,7 +3,6 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail
dEQP-GLES2.functional.draw.draw_arrays.line_loop.multiple_attributes,Fail dEQP-GLES2.functional.draw.draw_arrays.line_loop.multiple_attributes,Fail
dEQP-GLES2.functional.draw.draw_arrays.line_loop.single_attribute,Fail dEQP-GLES2.functional.draw.draw_arrays.line_loop.single_attribute,Fail
dEQP-GLES2.functional.fbo.completeness.size.distinct,Fail
dEQP-GLES2.functional.fbo.render.texsubimage.after_render_tex2d_rgba,Fail dEQP-GLES2.functional.fbo.render.texsubimage.after_render_tex2d_rgba,Fail
dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d_rgba,Fail dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d_rgba,Fail
dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose,Fail dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose,Fail

1
src/gallium/drivers/lima/ci/deqp-lima-skips.txt
View file

@ -11,7 +11,6 @@ dEQP-GLES[0-9]*.functional.flush_finish
# Flaky # Flaky
dEQP-GLES2.functional.default_vertex_attrib.* dEQP-GLES2.functional.default_vertex_attrib.*
dEQP-GLES2.functional.fbo.completeness.size.distinct
dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose
dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed
dEQP-GLES2.functional.shaders.builtin_variable.frontfacing dEQP-GLES2.functional.shaders.builtin_variable.frontfacing

7
src/mesa/main/fbobject.c
View file

@ -1226,9 +1226,9 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
} }
else if (att->Type == GL_RENDERBUFFER_EXT) { else if (att->Type == GL_RENDERBUFFER_EXT) {
minWidth = MIN2(minWidth, att->Renderbuffer->Width); minWidth = MIN2(minWidth, att->Renderbuffer->Width);
maxWidth = MAX2(minWidth, att->Renderbuffer->Width); maxWidth = MAX2(maxWidth, att->Renderbuffer->Width);
minHeight = MIN2(minHeight, att->Renderbuffer->Height); minHeight = MIN2(minHeight, att->Renderbuffer->Height);
maxHeight = MAX2(minHeight, att->Renderbuffer->Height); maxHeight = MAX2(maxHeight, att->Renderbuffer->Height);
f = att->Renderbuffer->InternalFormat; f = att->Renderbuffer->InternalFormat;
baseFormat = att->Renderbuffer->_BaseFormat; baseFormat = att->Renderbuffer->_BaseFormat;
attFormat = att->Renderbuffer->Format; attFormat = att->Renderbuffer->Format;
@ -1305,7 +1305,8 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
} }
} }
else { else {
if (!ctx->Extensions.ARB_framebuffer_object) { if (!_mesa_has_ARB_framebuffer_object(ctx) &&
!_mesa_is_gles3(ctx)) {
/* check that width, height, format are same */ /* check that width, height, format are same */
if (minWidth != maxWidth || minHeight != maxHeight) { if (minWidth != maxWidth || minHeight != maxHeight) {
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT; fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT;