From 8d86892ea3cd6239a9faae825bb657292a7ba848 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 16 May 2020 21:39:09 -0400 Subject: [PATCH] freedreno/a3xx: reinstate rgb10_a2ui texture format Rendering doesn't work, but having the format in place avoids an assert when selecting the texture format in st_format. I believe it's required for GLES3, so more tracing is required to determine what bit we're missing to make rendering work. Signed-off-by: Ilia Mirkin Reviewed-by: Rob Clark Part-of: --- .gitlab-ci/deqp-freedreno-a307-fails.txt | 19 ------------------- .../drivers/freedreno/a3xx/fd3_format.c | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.gitlab-ci/deqp-freedreno-a307-fails.txt b/.gitlab-ci/deqp-freedreno-a307-fails.txt index 1fcd57ad1df..557ff1a1745 100644 --- a/.gitlab-ci/deqp-freedreno-a307-fails.txt +++ b/.gitlab-ci/deqp-freedreno-a307-fails.txt @@ -60,20 +60,12 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y dEQP-GLES3.functional.fbo.color.blend.r8_src_over -dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb10_a2ui -dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2ui -dEQP-GLES3.functional.fbo.color.tex2darray.rgb10_a2ui -dEQP-GLES3.functional.fbo.color.tex2d.rgb10_a2ui -dEQP-GLES3.functional.fbo.color.tex3d.rgb10_a2ui -dEQP-GLES3.functional.fbo.color.texcube.rgb10_a2ui dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8i dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8ui dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb10_a2ui dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8i dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8ui dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb10_a2ui -dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.rgb10_a2ui -dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.rgb10_a2ui dEQP-GLES3.functional.fbo.depth.basic.depth24_stencil8 dEQP-GLES3.functional.fbo.depth.basic.depth32f_stencil8 dEQP-GLES3.functional.fbo.depth.basic.depth_component16 @@ -89,7 +81,6 @@ dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component16 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component24 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f -dEQP-GLES3.functional.fbo.invalidate.format.rgb10_a2ui dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_color dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_depth dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_color @@ -138,7 +129,6 @@ dEQP-GLES3.functional.fbo.msaa.4_samples.rgba4 dEQP-GLES3.functional.fbo.msaa.4_samples.rgba8 dEQP-GLES3.functional.fbo.msaa.4_samples.srgb8_alpha8 dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8 -dEQP-GLES3.functional.fbo.render.recreate_color.tex2d_rgb10_a2ui_depth_stencil_rbo_depth24_stencil8 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component16 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component24 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component32f @@ -150,7 +140,6 @@ dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_ dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component24 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component32f dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_stencil_rbo_stencil_index8 -dEQP-GLES3.functional.fbo.render.resize.tex2d_rgb10_a2ui dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_rbo_depth24_stencil8 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_stencil_rbo_depth24_stencil8 @@ -480,14 +469,6 @@ dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_component_type dEQP-GLES3.functional.state_query.integers.max_samples_getfloat dEQP-GLES3.functional.state_query.integers.max_samples_getinteger64 dEQP-GLES3.functional.state_query.rbo.renderbuffer_component_size_color -dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_npot -dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_pot -dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_npot -dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_pot -dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_npot -dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot -dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_npot -dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot dEQP-GLES3.functional.texture.mipmap.cube.max_level.linear_nearest dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_2d dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_cube diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c index a62223ee8eb..b5a5bb1bffc 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c @@ -189,7 +189,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = { _T(B10G10R10X2_UNORM, 10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ), V_(R10G10B10A2_SNORM, 10_10_10_2_SNORM, NONE, WZYX), V_(B10G10R10A2_SNORM, 10_10_10_2_SNORM, NONE, WXYZ), - V_(R10G10B10A2_UINT, 10_10_10_2_UINT, NONE, WZYX), + VT(R10G10B10A2_UINT, 10_10_10_2_UINT, NONE, WZYX), V_(B10G10R10A2_UINT, 10_10_10_2_UINT, NONE, WXYZ), V_(R10G10B10A2_USCALED, 10_10_10_2_UINT, NONE, WZYX), V_(B10G10R10A2_USCALED, 10_10_10_2_UINT, NONE, WXYZ), -- 2.30.2