Mesa (master): panfrost: Drop QUADS primitive convert
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 19 08:55:51 UTC 2020
Module: Mesa
Branch: master
Commit: 433fa39c2e616e2f0a6102904c93969a4e42e79c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=433fa39c2e616e2f0a6102904c93969a4e42e79c
Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date: Fri Aug 14 18:27:32 2020 -0400
panfrost: Drop QUADS primitive convert
Even Bifrost retains QUADS support.
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6327>
---
src/gallium/drivers/panfrost/pan_context.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index c63e4f9dc03..84843ac8786 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -299,18 +299,14 @@ panfrost_draw_vbo(
assert(ctx->rasterizer != NULL);
if (!(ctx->draw_modes & (1 << mode))) {
- if (mode == PIPE_PRIM_QUADS && info->count == 4 && !ctx->rasterizer->base.flatshade) {
- mode = PIPE_PRIM_TRIANGLE_FAN;
- } else {
- if (info->count < 4) {
- /* Degenerate case? */
- return;
- }
-
- util_primconvert_save_rasterizer_state(ctx->primconvert, &ctx->rasterizer->base);
- util_primconvert_draw_vbo(ctx->primconvert, info);
+ if (info->count < 4) {
+ /* Degenerate case? */
return;
}
+
+ util_primconvert_save_rasterizer_state(ctx->primconvert, &ctx->rasterizer->base);
+ util_primconvert_draw_vbo(ctx->primconvert, info);
+ return;
}
/* Now that we have a guaranteed terminating path, find the job.
More information about the mesa-commit
mailing list