KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Fix Bifrost blend descriptor emission 

Format conversion only works if the num_comps field is set to 4,
probably because the tile buffer always store those 4 components
internally.

Fixes: edd98aac3f ("panfrost: Add support for native wallpapering on Bifrost")
Fixes: 8389976b7c ("panfrost: XML-ify the blend descriptors")
Cc: 20.3 <mesa-stable>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7527>
This commit is contained in:
Boris Brezillon 2020-11-10 09:57:24 +01:00 committed by Marge Bot
parent 7737ca7539
commit 35ae9408f2
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.gitlab-ci/deqp-panfrost-g52-fails.txt
View File

@ -13,54 +13,17 @@ dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rg8,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb10_a2,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.fbo.completeness.size.distinct,Fail
dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_rgb565,Fail
dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_rgb565_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.color.blend_npot_tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.color.blend_npot_tex2d_rgb_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.color.blend_rbo_rgb565,Fail
dEQP-GLES2.functional.fbo.render.color.blend_rbo_rgb565_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.color.blend_tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.color.blend_tex2d_rgb_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_stencil_index8,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_stencil_index8,Fail
dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d_rgb,Fail
dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose,Fail
dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed,Fail
dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_xyz,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.88,Fail
dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear,Fail
dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear,Fail
dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_fastest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_nicest,Fail
dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear,Fail
dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest,Fail
dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.2d_alpha,Fail
dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_alpha,Fail
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_alpha,Fail
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_alpha,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp,Fail

5
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@ -296,7 +296,10 @@ panfrost_emit_bifrost_blend(struct panfrost_batch *batch,
else
cfg.bifrost.internal.mode = MALI_BIFROST_BLEND_MODE_FIXED_FUNCTION;
cfg.bifrost.internal.fixed_function.num_comps = format_desc->nr_channels;
/* If we want the conversion to work properly,
* num_comps must be set to 4
*/
cfg.bifrost.internal.fixed_function.num_comps = 4;
cfg.bifrost.internal.fixed_function.conversion.memory_format.format =
panfrost_format_to_bifrost_blend(format_desc, true);
if (dev->quirks & HAS_SWIZZLES) {

2
src/panfrost/lib/pan_blit.c
View File

@ -569,7 +569,7 @@ bifrost_load_emit_blend_rt(struct pan_pool *pool, void *out,
cfg.bifrost.equation.alpha.b = MALI_BLEND_OPERAND_B_SRC;
cfg.bifrost.equation.alpha.c = MALI_BLEND_OPERAND_C_ZERO;
cfg.bifrost.equation.color_mask = 0xf;
cfg.bifrost.internal.fixed_function.num_comps = format_desc->nr_channels;
cfg.bifrost.internal.fixed_function.num_comps = 4;
cfg.bifrost.internal.fixed_function.conversion.memory_format.format =
panfrost_format_to_bifrost_blend(format_desc, true);
cfg.bifrost.internal.fixed_function.conversion.register_format =