fix compare w/ zero warnings (bug 988766)

diff --git a/src/mesa/drivers/dri/i915/i915_debug.c b/src/mesa/drivers/dri/i915/i915_debug.c
index 7a5777d71af96eae7d79a1e09bcef69812eb1a52..054b561605a9188132b6332e2e590e3e64d614a5 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_debug.c
+++ b/src/mesa/drivers/dri/i915/i915_debug.c
@@ -285,7 +285,7 @@ void i915_disassemble_program( const GLuint *program, GLuint sz )
    for (i = 1 ; i < sz ; i+=3, program+=3) {
       GLuint opcode = program[0] & (0x1f<<24);
 
-      if (opcode >= A0_NOP && opcode <= A0_SLT)
+      if ((GLint) opcode >= A0_NOP && opcode <= A0_SLT)
         print_arith_op(opcode >> 24, program);
       else if (opcode >= T0_TEXLD && opcode <= T0_TEXKILL)
         print_tex_op(opcode >> 24, program);

diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index 5ba6920804e2a63dd9b28e99036b01a85ebc6f89..4322f26da4c3e1c47a68f2579273e61375c3e182 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1203,7 +1202,7 @@ static GLboolean TAG(validate_render)( GLcontext *ctx,
            ok = GL_TRUE;
         } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
            if (HAVE_ELTS) {
-              ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+              ok = (GLint) count < GET_SUBSEQUENT_VB_MAX_ELTS();
            }
            else {
               ok = GL_FALSE;
@@ -1216,7 +1215,7 @@ static GLboolean TAG(validate_render)( GLcontext *ctx,
         if (HAVE_QUADS) {
            ok = GL_TRUE;
         } else if (HAVE_ELTS) {
-           ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+           ok = (GLint) count < GET_SUBSEQUENT_VB_MAX_ELTS();
         }
         else {
            ok = GL_FALSE;