added missing \'s

[mesa.git] / src / mesa / swrast / s_points.c

diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index ecad3efe7cc0cefa8d5ca04ab71cefea832b61fd..0c3b4d0f08448075b7adf30a6be9981f60ef5682 100644 (file)
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -1,21 +1,21 @@
-/* $Id: s_points.c,v 1.11 2001/01/04 15:32:10 brianp Exp $ */
+/* $Id: s_points.c,v 1.15 2001/03/12 00:48:42 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ *
+ * Copyright (C) 1999-2001  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
@@ -26,6 +26,7 @@
 
 
 #include "glheader.h"
+#include "colormac.h"
 #include "context.h"
 #include "macros.h"
 #include "mmath.h"
@@ -158,6 +159,18 @@
 
 
 
+void _swrast_add_spec_terms_point( GLcontext *ctx,
+                                  const SWvertex *v0 )
+{
+   SWvertex *ncv0 = (SWvertex *)v0;
+   GLchan c[1][4];
+   COPY_CHAN4( c[0], ncv0->color );
+   ACC_3V( ncv0->color, ncv0->specular );
+   SWRAST_CONTEXT(ctx)->SpecPoint( ctx, ncv0 );
+   COPY_CHAN4( ncv0->color, c[0] );
+}
+
+
 
 /* record the current point function name */
 #ifdef DEBUG
@@ -182,11 +195,11 @@ do {                                   \
  * Examine the current context to determine which point drawing function
  * should be used.
  */
-void 
+void
 _swrast_choose_point( GLcontext *ctx )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLboolean rgbMode = ctx->Visual.RGBAflag;
+   GLboolean rgbMode = ctx->Visual.rgbMode;
 
    if (ctx->RenderMode==GL_RENDER) {
       if (ctx->Point.SpriteMode) {
@@ -256,10 +269,10 @@ _swrast_choose_point( GLcontext *ctx )
       }
    }
    else if (ctx->RenderMode==GL_FEEDBACK) {
-      USE(gl_feedback_point);
+      USE(_mesa_feedback_point);
    }
    else {
       /* GL_SELECT mode */
-      USE(gl_select_point);
+      USE(_mesa_select_point);
    }
 }