Mesa (master): panfrost: Fix primconvert check

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7c02c4f114b1a79ef9f5c7f725cdfee818b3977a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c02c4f114b1a79ef9f5c7f725cdfee818b3977a

Author: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Date:   Fri Mar 15 02:13:34 2019 +0000

panfrost: Fix primconvert check

In addition to fixing actual primconvert bugs, this prevents an infinite
loop when trying to draw POINTS.

Signed-off-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>

---

 src/gallium/drivers/panfrost/pan_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 378a631410b..b6cf5302cae 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -1362,7 +1362,7 @@ panfrost_draw_vbo(
 
         /* Fallback for unsupported modes */
 
-        if (!(ctx->draw_modes & mode)) {
+        if (!(ctx->draw_modes & (1 << mode))) {
                 if (mode == PIPE_PRIM_QUADS && info->count == 4 && ctx->rasterizer && !ctx->rasterizer->base.flatshade) {
                         mode = PIPE_PRIM_TRIANGLE_FAN;
                 } else {