From 721b5c6eef64ab968373cb977503c63c2c6f2d01 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 9 Jul 2020 14:39:51 -0400 Subject: [PATCH] panfrost: Set PIPE_CAP_MIXED_COLORBUFFER_FORMATS Missed that this is needed, fixes fbo.completeness.* Signed-off-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/deqp-panfrost-t860-fails.txt | 20 -------------------- src/gallium/drivers/panfrost/pan_screen.c | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.gitlab-ci/deqp-panfrost-t860-fails.txt b/.gitlab-ci/deqp-panfrost-t860-fails.txt index 9fd285185da..26dda2d4439 100644 --- a/.gitlab-ci/deqp-panfrost-t860-fails.txt +++ b/.gitlab-ci/deqp-panfrost-t860-fails.txt @@ -18,26 +18,6 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y dEQP-GLES3.functional.fbo.color.repeated_clear.blit.rbo.srgb8_alpha8 dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.srgb8_alpha8 dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.srgb8_alpha8 -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_none_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_none_rbo -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_none_tex -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_rbo_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_rbo_rbo -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_tex_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.rbo_tex_tex_tex -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_none_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_none_rbo -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_none_tex -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_rbo_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_rbo_rbo -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_tex_none -dEQP-GLES3.functional.fbo.completeness.attachment_combinations.tex_rbo_tex_tex -dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short -dEQP-GLES3.functional.fbo.completeness.samples.rbo0_rbo0_tex -dEQP-GLES3.functional.fbo.completeness.samples.rbo0_tex_none -dEQP-GLES3.functional.fbo.completeness.samples.rbo1_rbo1_rbo1 -dEQP-GLES3.functional.fbo.completeness.samples.rbo2_rbo1_none -dEQP-GLES3.functional.fbo.completeness.samples.rbo2_rbo2_none dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_color dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_stencil diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index b6634955ea9..e200f396177 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -104,6 +104,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) switch (param) { case PIPE_CAP_NPOT_TEXTURES: + case PIPE_CAP_MIXED_COLORBUFFER_FORMATS: case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES: case PIPE_CAP_MIXED_COLOR_DEPTH_BITS: case PIPE_CAP_FRAGMENT_SHADER_TEXTURE_LOD: -- 2.30.2