Merge Mesa 18.3.2

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_aa_point.c b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_aa_point.c
index 4b14a2fc9..cdd4fef25 100644
--- a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_aa_point.c
+++ b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_aa_point.c
@@ -73,7 +73,7 @@ aa_decl(struct tgsi_transform_context *ctx,
       ts->num_input++;
    }
    else if (decl->Declaration.File == TGSI_FILE_TEMPORARY) {
-      ts->num_tmp = MAX2(ts->num_tmp, decl->Range.Last + 1);
+      ts->num_tmp = MAX2(ts->num_tmp, (unsigned)(decl->Range.Last + 1));
    }
 
    ctx->emit_declaration(ctx, decl);
@@ -217,7 +217,7 @@ aa_inst(struct tgsi_transform_context *ctx,
    for (i = 0; i < inst->Instruction.NumDstRegs; i++) {
       struct tgsi_full_dst_register *dst = &inst->Dst[i];
       if (dst->Register.File == TGSI_FILE_OUTPUT &&
-          dst->Register.Index == ts->color_out) {
+	  dst->Register.Index == (int)ts->color_out) {
          dst->Register.File = TGSI_FILE_TEMPORARY;
          dst->Register.Index = ts->color_tmp;
       }