Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / swrast / s_triangle.h

diff --git a/src/mesa/swrast/s_triangle.h b/src/mesa/swrast/s_triangle.h
index d08fc9177ffb5d30fed40d77ddd89c59668c69ac..46e23d4208323494bfce322ea5ebb00500e53454 100644 (file)
--- a/src/mesa/swrast/s_triangle.h
+++ b/src/mesa/swrast/s_triangle.h
@@ -1,21 +1,20 @@
-/* $Id: s_triangle.h,v 1.3 2000/11/19 23:10:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  5.1
+ *
+ * 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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -25,26 +24,27 @@
  */
 
 
-
-
-
 #ifndef S_TRIANGLES_H
 #define S_TRIANGLES_H
 
 
-#include "types.h"
 #include "swrast.h"
 
 
-GLboolean gl_cull_triangle( GLcontext *ctx, 
-                           const SWvertex *v0,
-                           const SWvertex *v1,
-                           const SWvertex *v2);
+extern GLboolean
+_swrast_culltriangle( struct gl_context *ctx,
+                     const SWvertex *v0,
+                     const SWvertex *v1,
+                     const SWvertex *v2);
 
+extern void
+_swrast_choose_triangle( struct gl_context *ctx );
 
-void 
-_swrast_choose_triangle( GLcontext *ctx );
+extern void
+_swrast_add_spec_terms_triangle( struct gl_context *ctx,
+                                const SWvertex *v0,
+                                const SWvertex *v1,
+                                const SWvertex *v2 );
 
 
 #endif
-