r300: some ctrl-m's wierd.

diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index 08e41820d65ed921485d3944e096771d202c44b9..8b0da0db4e078dbdc4257abc2064a61ebb76ce6a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -1173,9 +1173,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R300_RS_IP_3                                   0x431C
 #       define R300_RS_INTERP_SRC_SHIFT          2 /* TODO: check for removal */
 #       define R300_RS_INTERP_SRC_MASK           (7 << 2) /* TODO: check for removal */
-#      define R300_RS_TEX_PTR(x)                       (x << 0)\r
-#      define R300_RS_COL_PTR(x)                       (x << 6)\r
-#      define R300_RS_COL_FMT(x)                       (x << 9)\r
+#      define R300_RS_TEX_PTR(x)                       (x << 0)
+#      define R300_RS_COL_PTR(x)                       (x << 6)
+#      define R300_RS_COL_FMT(x)                       (x << 9)
 #      define R300_RS_COL_FMT_RGBA                     0
 #      define R300_RS_COL_FMT_RGB0                     1
 #      define R300_RS_COL_FMT_RGB1                     2
@@ -1189,12 +1189,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #      define R300_RS_SEL_T(x)                         (x << 16)
 #      define R300_RS_SEL_R(x)                         (x << 19)
 #      define R300_RS_SEL_Q(x)                         (x << 22)
-#      define R300_RS_SEL_C0                           0\r
-#      define R300_RS_SEL_C1                           1\r
-#      define R300_RS_SEL_C2                           2\r
-#      define R300_RS_SEL_C3                           3\r
-#      define R300_RS_SEL_K0                           4\r
-#      define R300_RS_SEL_K1                           5\r
+#      define R300_RS_SEL_C0                           0
+#      define R300_RS_SEL_C1                           1
+#      define R300_RS_SEL_C2                           2
+#      define R300_RS_SEL_C3                           3
+#      define R300_RS_SEL_K0                           4
+#      define R300_RS_SEL_K1                           5
 
 
 /*  */
@@ -1214,17 +1214,17 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R500_RS_INST_13                                        0x4354
 #define R500_RS_INST_14                                        0x4358
 #define R500_RS_INST_15                                        0x435c
-#define R500_RS_INST_TEX_ID_SHIFT                      0\r
-#define R500_RS_INST_TEX_CN_WRITE                      (1 << 4)\r
-#define R500_RS_INST_TEX_ADDR_SHIFT                    5\r
-#define R500_RS_INST_COL_ID_SHIFT                      12\r
-#define R500_RS_INST_COL_CN_NO_WRITE                   (0 << 16)\r
-#define R500_RS_INST_COL_CN_WRITE                      (1 << 16)\r
-#define R500_RS_INST_COL_CN_WRITE_FBUFFER              (2 << 16)\r
-#define R500_RS_INST_COL_CN_WRITE_BACKFACE             (3 << 16)\r
-#define R500_RS_INST_COL_ADDR_SHIFT                    18\r
-#define R500_RS_INST_TEX_ADJ                           (1 << 25)\r
-#define R500_RS_INST_W_CN                              (1 << 26)\r
+#define R500_RS_INST_TEX_ID_SHIFT                      0
+#define R500_RS_INST_TEX_CN_WRITE                      (1 << 4)
+#define R500_RS_INST_TEX_ADDR_SHIFT                    5
+#define R500_RS_INST_COL_ID_SHIFT                      12
+#define R500_RS_INST_COL_CN_NO_WRITE                   (0 << 16)
+#define R500_RS_INST_COL_CN_WRITE                      (1 << 16)
+#define R500_RS_INST_COL_CN_WRITE_FBUFFER              (2 << 16)
+#define R500_RS_INST_COL_CN_WRITE_BACKFACE             (3 << 16)
+#define R500_RS_INST_COL_ADDR_SHIFT                    18
+#define R500_RS_INST_TEX_ADJ                           (1 << 25)
+#define R500_RS_INST_W_CN                              (1 << 26)
 
 /* These DWORDs control how vertex data is routed into fragment program
  * registers, after interpolators.