X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fsparc%2Fsparc.c;h=8d0509ccd65c33db6ede9510561eb9b29ffa276c;hb=58790043bb9e222f54994eba6ec78429d0d23625;hp=d39751dbd0c99619a41ec7dbeb0f5e045232dd7e;hpb=0a79baf1bff93718e50a3ba4bad6390ea1cfb01c;p=mesa.git

diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index d39751dbd0c..8d0509ccd65 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -1,10 +1,7 @@
-/* $Id: sparc.c,v 1.6 2002/04/09 14:58:03 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  * 
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -19,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /*
@@ -29,10 +27,13 @@
  */
 
 
-#include "context.h"
+#include "sparc.h"
+
+#ifdef USE_SPARC_ASM
+
+#include "main/context.h"
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
-#include "sparc.h"
 
 #ifdef DEBUG
 #include "math/m_debug.h"
@@ -68,7 +69,6 @@
       _mesa_##pfx##_transform_points##sz##_3d;
 
 
-#ifdef USE_SPARC_ASM
 DECLARE_XFORM_GROUP(sparc, 1)
 DECLARE_XFORM_GROUP(sparc, 2)
 DECLARE_XFORM_GROUP(sparc, 3)
@@ -78,19 +78,21 @@ extern GLvector4f  *_mesa_sparc_cliptest_points4(GLvector4f *clip_vec,
 						 GLvector4f *proj_vec,
 						 GLubyte clipMask[],
 						 GLubyte *orMask,
-						 GLubyte *andMask);
+						 GLubyte *andMask,
+						 GLboolean viewport_z_clip);
 
 extern GLvector4f  *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec,
 						    GLvector4f *proj_vec,
 						    GLubyte clipMask[],
 						    GLubyte *orMask,
-						    GLubyte *andMask);
+						    GLubyte *andMask,
+						    GLboolean viewport_z_clip);
 
 #define NORM_ARGS	const GLmatrix *mat,				\
 			GLfloat scale,					\
-			const GLvector3f *in,				\
+			const GLvector4f *in,				\
 			const GLfloat *lengths,				\
-			GLvector3f *dest
+			GLvector4f *dest
 
 extern void _mesa_sparc_transform_normalize_normals(NORM_ARGS);
 extern void _mesa_sparc_transform_normalize_normals_no_rot(NORM_ARGS);
@@ -101,11 +103,10 @@ extern void _mesa_sparc_transform_normals(NORM_ARGS);
 extern void _mesa_sparc_normalize_normals(NORM_ARGS);
 extern void _mesa_sparc_rescale_normals(NORM_ARGS);
 
-#endif
+
 
 void _mesa_init_all_sparc_transform_asm(void)
 {
-#ifdef USE_SPARC_ASM
    ASSIGN_XFORM_GROUP(sparc, 1)
    ASSIGN_XFORM_GROUP(sparc, 2)
    ASSIGN_XFORM_GROUP(sparc, 3)
@@ -131,42 +132,11 @@ void _mesa_init_all_sparc_transform_asm(void)
    _mesa_normal_tab[NORM_RESCALE] =
 	   _mesa_sparc_rescale_normals;
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions("sparc");
    _math_test_all_cliptest_functions("sparc");
    _math_test_all_normal_transform_functions("sparc");
 #endif
-
-#endif
 }
 
-extern unsigned int _mesa_sparc_glapi_begin;
-extern unsigned int _mesa_sparc_glapi_end;
-extern void __glapi_sparc_icache_flush(unsigned int *);
-
-void _mesa_init_sparc_glapi_relocs(void)
-{
-	unsigned int *insn_ptr, *end_ptr;
-	unsigned long disp_addr;
-
-	insn_ptr = &_mesa_sparc_glapi_begin;
-	end_ptr = &_mesa_sparc_glapi_end;
-	disp_addr = (unsigned long) &_glapi_Dispatch;
-
-	while (insn_ptr < end_ptr) {
-#ifdef __sparc_v9__
-		insn_ptr[0] |= (disp_addr >> (32 + 10));
-		insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10);
-		__glapi_sparc_icache_flush(&insn_ptr[0]);
-		insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1));
-		insn_ptr[3] |= (disp_addr & ((1 << 10) - 1));
-		__glapi_sparc_icache_flush(&insn_ptr[2]);
-		insn_ptr += 10;
-#else
-		insn_ptr[0] |= (disp_addr >> 10);
-		insn_ptr[1] |= (disp_addr & ((1 << 10) - 1));
-		__glapi_sparc_icache_flush(&insn_ptr[0]);
-		insn_ptr += 4;
-#endif
-	}
-}
+#endif /* USE_SPARC_ASM */