util/os_file: fix double-close()

[mesa.git] / src / mesa / sparc / sparc_matrix.h

diff --git a/src/mesa/sparc/sparc_matrix.h b/src/mesa/sparc/sparc_matrix.h
index 4fe09e83eaf49376c305e07e211d9abb1a506191..d478b76802f6c3ac777621ffb9a0072bf23db858 100644 (file)
--- a/src/mesa/sparc/sparc_matrix.h
+++ b/src/mesa/sparc/sparc_matrix.h
@@ -1,28 +1,18 @@
-/* $Id: sparc_matrix.h,v 1.3 2001/06/06 11:46:04 davem69 Exp $ */
+/*
+ * SPARC assembly matrix code.
+ */
 
 #ifndef _SPARC_MATRIX_H
 #define _SPARC_MATRIX_H
 
-#ifdef __sparc_v9__
+#ifdef __arch64__
 #define LDPTR          ldx
-#define MAT_M          0x00
-#define MAT_INV                0x08
-#define V4F_DATA       0x00
-#define V4F_START      0x08
-#define V4F_COUNT      0x10
-#define V4F_STRIDE     0x14
-#define V4F_SIZE       0x18
-#define V4F_FLAGS      0x1c
+#define MATH_ASM_PTR_SIZE 8
+#include "math/m_vector_asm.h"
 #else
 #define LDPTR          ld
-#define MAT_M          0x00
-#define MAT_INV                0x04
-#define V4F_DATA       0x00
-#define V4F_START      0x04
-#define V4F_COUNT      0x08
-#define V4F_STRIDE     0x0c
-#define V4F_SIZE       0x10
-#define V4F_FLAGS      0x14
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
 #endif
 
 #define VEC_SIZE_1     1
@@ -149,7 +139,7 @@
 #define LDMATRIX_0_5_10(BASE)                  \
        ld      [BASE + ( 0 * 0x4)], M0;        \
        ld      [BASE + ( 5 * 0x4)], M5;        \
-       ld      [BASE + (10 * 0x4)], M10;       \
+       ld      [BASE + (10 * 0x4)], M10;
 
 #define LDMATRIX_0_5_10_12_13_14(BASE)                 \
        ld      [BASE + ( 0 * 0x4)], M0;        \