vbo: pass the stream from DrawTransformFeedbackStream to drivers

[mesa.git] / src / mesa / tnl / t_vb_lighttmp.h

diff --git a/src/mesa/tnl/t_vb_lighttmp.h b/src/mesa/tnl/t_vb_lighttmp.h
index a354f1277335def497e66b668664fe1fce1808b8..3aebcd4b79949db6375a42adba492977721ef550 100644 (file)
--- a/src/mesa/tnl/t_vb_lighttmp.h
+++ b/src/mesa/tnl/t_vb_lighttmp.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -17,14 +16,14 @@
  * 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
- * THE AUTHORS 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.
  *
  *
  * Authors:
- *    Brian Paul
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Brian Paul Keith Whitwell <keithw@vmware.com>
  */
 
 
@@ -69,7 +68,7 @@ static void TAG(light_rgba_spec)( struct gl_context *ctx,
    const GLuint nr = VB->Count;
 
 #ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
+   fprintf(stderr, "%s\n", __func__ );
 #endif
 
    VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
@@ -113,7 +112,7 @@ static void TAG(light_rgba_spec)( struct gl_context *ctx,
         GLint side;
         GLfloat contrib[3];
         GLfloat attenuation;
-        GLfloat VP[3];  /* unit vector from vertex to light */
+        GLfloat VP[3];          /* unit vector from vertex to light */
         GLfloat n_dot_VP;       /* n dot VP */
         GLfloat *h;
 
@@ -130,7 +129,7 @@ static void TAG(light_rgba_spec)( struct gl_context *ctx,
 
            d = (GLfloat) LEN_3FV( VP );
 
-           if (d > 1e-6) {
+           if (d > 1e-6F) {
               GLfloat invd = 1.0F / d;
               SELF_SCALE_SCALAR_3V(VP, invd);
            }
@@ -153,7 +152,7 @@ static void TAG(light_rgba_spec)( struct gl_context *ctx,
            }
         }
 
-        if (attenuation < 1e-3)
+        if (attenuation < 1e-3F)
            continue;           /* this light makes no contribution */
 
         /* Compute dot product or normal and vector from V to light pos */
@@ -205,7 +204,7 @@ static void TAG(light_rgba_spec)( struct gl_context *ctx,
 
         if (n_dot_h > 0.0F) {
            GLfloat spec_coef = lookup_shininess(ctx, side, n_dot_h);
-           if (spec_coef > 1.0e-10) {
+           if (spec_coef > 1.0e-10F) {
               spec_coef *= attenuation;
               ACC_SCALE_SCALAR_3V( spec[side], spec_coef,
                                    light->_MatSpecular[side]);
@@ -250,7 +249,7 @@ static void TAG(light_rgba)( struct gl_context *ctx,
    const GLuint nr = VB->Count;
 
 #ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
+   fprintf(stderr, "%s\n", __func__ );
 #endif
 
    VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
@@ -284,12 +283,11 @@ static void TAG(light_rgba)( struct gl_context *ctx,
 
       /* Add contribution from each enabled light source */
       foreach (light, &ctx->Light.EnabledList) {
-
         GLfloat n_dot_h;
         GLfloat correction;
         GLint side;
         GLfloat contrib[3];
-        GLfloat attenuation = 1.0;
+        GLfloat attenuation;
         GLfloat VP[3];          /* unit vector from vertex to light */
         GLfloat n_dot_VP;       /* n dot VP */
         GLfloat *h;
@@ -303,12 +301,11 @@ static void TAG(light_rgba)( struct gl_context *ctx,
         else {
            GLfloat d;     /* distance from vertex to light */
 
-
            SUB_3V(VP, light->_Position, vertex);
 
            d = (GLfloat) LEN_3FV( VP );
 
-           if ( d > 1e-6) {
+           if (d > 1e-6F) {
               GLfloat invd = 1.0F / d;
               SELF_SCALE_SCALAR_3V(VP, invd);
            }
@@ -331,7 +328,7 @@ static void TAG(light_rgba)( struct gl_context *ctx,
            }
         }
 
-        if (attenuation < 1e-3)
+        if (attenuation < 1e-3F)
            continue;           /* this light makes no contribution */
 
         /* Compute dot product or normal and vector from V to light pos */
@@ -430,7 +427,7 @@ static void TAG(light_fast_rgba_single)( struct gl_context *ctx,
 #endif
 
 #ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
+   fprintf(stderr, "%s\n", __func__ );
 #endif
 
    (void) input;               /* doesn't refer to Eye or Obj */
@@ -534,7 +531,7 @@ static void TAG(light_fast_rgba)( struct gl_context *ctx,
    const struct gl_light *light;
 
 #ifdef TRACE
-   fprintf(stderr, "%s %d\n", __FUNCTION__, nr );
+   fprintf(stderr, "%s %d\n", __func__, nr );
 #endif
 
    (void) input;