From 5488fe84f97b839287abc39727d60ef680f9dd5c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Wed, 18 Mar 2009 11:35:26 +0000
Subject: draw: use AOS_ERROR rather than clash-prone ERROR() macro

---
 src/gallium/auxiliary/draw/draw_vs_aos.c    | 12 ++++++------
 src/gallium/auxiliary/draw/draw_vs_aos.h    |  2 +-
 src/gallium/auxiliary/draw/draw_vs_aos_io.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.c b/src/gallium/auxiliary/draw/draw_vs_aos.c
index 1fb69ef81a..9e37a26c1e 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos.c
@@ -143,7 +143,7 @@ static struct x86_reg get_reg_ptr(struct aos_compilation *cp,
       return x86_make_disp(aos_get_x86(cp, 1, X86_CONSTANTS), idx * 4 * sizeof(float));
 
    default:
-      ERROR(cp, "unknown reg file");
+      AOS_ERROR(cp, "unknown reg file");
       return x86_make_reg(0,0);
    }
 }
@@ -177,7 +177,7 @@ static void spill( struct aos_compilation *cp, unsigned idx )
        (cp->xmm[idx].file != TGSI_FILE_INPUT && /* inputs are fetched into xmm & set dirty */
         cp->xmm[idx].file != TGSI_FILE_OUTPUT &&
         cp->xmm[idx].file != TGSI_FILE_TEMPORARY)) {
-      ERROR(cp, "invalid spill");
+      AOS_ERROR(cp, "invalid spill");
       return;
    }
    else {
@@ -543,7 +543,7 @@ static struct x86_reg fetch_src( struct aos_compilation *cp,
       switch (swizzle) {
       case TGSI_EXTSWIZZLE_ZERO:
       case TGSI_EXTSWIZZLE_ONE:
-         ERROR(cp, "not supporting full swizzles yet in tgsi_aos_sse2");
+         AOS_ERROR(cp, "not supporting full swizzles yet in tgsi_aos_sse2");
          break;
 
       default:
@@ -564,7 +564,7 @@ static struct x86_reg fetch_src( struct aos_compilation *cp,
          break;
 
       default:
-         ERROR(cp, "unsupported sign-mode");
+         AOS_ERROR(cp, "unsupported sign-mode");
          break;
       }
    }
@@ -603,7 +603,7 @@ static struct x86_reg fetch_src( struct aos_compilation *cp,
 
 
       if (abs && abs != 0xf) {
-         ERROR(cp, "unsupported partial abs");
+         AOS_ERROR(cp, "unsupported partial abs");
       }
       else if (abs) {
          struct x86_reg neg = aos_get_internal(cp, IMM_NEGS);
@@ -670,7 +670,7 @@ static void x87_fld_src( struct aos_compilation *cp,
       break;
 
    default:
-      ERROR(cp, "unsupported sign-mode");
+      AOS_ERROR(cp, "unsupported sign-mode");
       break;
    }
 }
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.h b/src/gallium/auxiliary/draw/draw_vs_aos.h
index 264387517b..2cf72ddf7b 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos.h
+++ b/src/gallium/auxiliary/draw/draw_vs_aos.h
@@ -204,7 +204,7 @@ struct x86_reg aos_get_internal_xmm( struct aos_compilation *cp,
                                      unsigned imm );
 
 
-#define ERROR(cp, msg)                                                  \
+#define AOS_ERROR(cp, msg)                                                  \
 do {                                                                    \
    if (0) debug_printf("%s: x86 translation failed: %s\n", __FUNCTION__, msg); \
    cp->error = 1;                                                       \
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_io.c b/src/gallium/auxiliary/draw/draw_vs_aos_io.c
index 39f75b50b7..a6eb37d128 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos_io.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_io.c
@@ -199,7 +199,7 @@ static boolean load_input( struct aos_compilation *cp,
       emit_load_R8G8B8A8_UNORM(cp, dataXMM, src);
       break;
    default:
-      ERROR(cp, "unhandled input format");
+      AOS_ERROR(cp, "unhandled input format");
       return FALSE;
    }
 
@@ -410,7 +410,7 @@ static boolean emit_output( struct aos_compilation *cp,
       }
       break;
    default:
-      ERROR(cp, "unhandled output format");
+      AOS_ERROR(cp, "unhandled output format");
       return FALSE;
    }
 
-- 
cgit v1.2.3