Mesa (master): draw: fix building error in draw_gs_init()

[GitLab Mirror]

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

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Apr 13 18:34:53 2019 +0200

draw: fix building error in draw_gs_init()

Fixes the following building error happening with Android build system:

external/mesa/src/gallium/auxiliary/draw/draw_gs.c:740:79:
error: address of array 'draw->gs.tgsi.machine->PrimitiveOffsets' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
         if (!draw->gs.tgsi.machine->Primitives[i] || !draw->gs.tgsi.machine->PrimitiveOffsets)
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
1 error generated.

Fixes: 7720ce3 ("draw: add support to tgsi paths for geometry streams. (v2)")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/auxiliary/draw/draw_gs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 1d6040993c6..6420cfbb261 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -737,7 +737,7 @@ draw_gs_init( struct draw_context *draw )
             MAX_PRIMITIVES * sizeof(struct tgsi_exec_vector), 16);
          draw->gs.tgsi.machine->PrimitiveOffsets[i] = align_malloc(
             MAX_PRIMITIVES * sizeof(struct tgsi_exec_vector), 16);
-         if (!draw->gs.tgsi.machine->Primitives[i] || !draw->gs.tgsi.machine->PrimitiveOffsets)
+         if (!draw->gs.tgsi.machine->Primitives[i] || !draw->gs.tgsi.machine->PrimitiveOffsets[i])
             return FALSE;
          memset(draw->gs.tgsi.machine->Primitives[i], 0,
                 MAX_PRIMITIVES * sizeof(struct tgsi_exec_vector));