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

diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index 3bde98e34bc..8d0509ccd65 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  * 
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  * 
@@ -17,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.
  */
 
 /*
@@ -78,13 +78,15 @@ 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,					\
@@ -109,12 +111,10 @@ void _mesa_init_all_sparc_transform_asm(void)
    ASSIGN_XFORM_GROUP(sparc, 2)
    ASSIGN_XFORM_GROUP(sparc, 3)
    ASSIGN_XFORM_GROUP(sparc, 4)
-#if 0
+
    _mesa_clip_tab[4] = _mesa_sparc_cliptest_points4;
    _mesa_clip_np_tab[4] = _mesa_sparc_cliptest_points4_np;
-#endif
-#if 0
-   /* disable these too.  See bug 673938 */
+
    _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =
 	   _mesa_sparc_transform_normalize_normals;
    _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =
@@ -131,7 +131,6 @@ void _mesa_init_all_sparc_transform_asm(void)
 	   _mesa_sparc_normalize_normals;
    _mesa_normal_tab[NORM_RESCALE] =
 	   _mesa_sparc_rescale_normals;
-#endif
 
 #ifdef DEBUG_MATH
    _math_test_all_transform_functions("sparc");