Module: Mesa Branch: master Commit: 500945041391f1dcacf8dc7bc0d91fb45aeb8f53 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=500945041391f1dcacf8dc7bc0d91fb45aeb8f53
Author: Eric Anholt <[email protected]> Date: Wed Feb 3 10:20:31 2021 -0800 freedreno/a6xx: Skip guessing VSC size with indirect TF draw counts. Fixes an assertion failure when we try to figure out how many bits to store the "0" draw count. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8843> --- .gitlab-ci/deqp-freedreno-a630-fails.txt | 7 +++---- src/gallium/drivers/freedreno/a6xx/fd6_draw.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt index fa763fc36df..0a4c87a0eb7 100644 --- a/.gitlab-ci/deqp-freedreno-a630-fails.txt +++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt @@ -4,10 +4,9 @@ KHR-GL33.transform_feedback.api_errors_test,Fail KHR-GL33.transform_feedback.capture_vertex_interleaved_test,Fail KHR-GL33.transform_feedback.capture_vertex_separate_test,Fail KHR-GL33.transform_feedback.discard_vertex_test,Fail -KHR-GL33.transform_feedback.draw_xfb_feedbackk_test,Crash -KHR-GL33.transform_feedback.draw_xfb_instanced_test,Crash -KHR-GL33.transform_feedback.draw_xfb_stream_instanced_test,Crash -KHR-GL33.transform_feedback.draw_xfb_test,Crash +KHR-GL33.transform_feedback.draw_xfb_feedbackk_test,Fail +KHR-GL33.transform_feedback.draw_xfb_instanced_test,Fail +KHR-GL33.transform_feedback.draw_xfb_test,Fail KHR-GL33.transform_feedback.query_vertex_interleaved_test,Fail KHR-GL33.transform_feedback.query_vertex_separate_test,Fail KHR-GL33.cull_distance.coverage,Fail diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c index a3939383681..5f2dfb8dcee 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c @@ -201,7 +201,7 @@ fd6_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info, if (emit.key.gs) emit.key.key.has_gs = true; - if (!(emit.key.hs || emit.key.ds || emit.key.gs || (indirect && indirect->buffer))) + if (!(emit.key.hs || emit.key.ds || emit.key.gs || indirect)) fd6_vsc_update_sizes(ctx->batch, info, draw); fixup_shader_state(ctx, &emit.key.key); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
