draw: fix building error in draw_gs_init()
authorMauro Rossi <issor.oruam@gmail.com>
Sat, 13 Apr 2019 16:34:53 +0000 (18:34 +0200)
committerDave Airlie <airlied@redhat.com>
Sun, 14 Apr 2019 08:07:02 +0000 (18:07 +1000)
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@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/gallium/auxiliary/draw/draw_gs.c

index 1d6040993c6441d6c75b9044aa51341aafa74ac1..6420cfbb2613e8cf40cc5a24b67c235b4f6f5cb6 100644 (file)
@@ -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));