intel: Transition intel_region_map() to being a miptree operation.

[mesa.git] / src / mesa / tnl / t_vb_normals.c

diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index c2202bef82c0d9d46be378fc9d0c0311b04e5b7e..c19b48e51ee027a380f9142e7cb6f368f9161eba 100644 (file)
--- a/src/mesa/tnl/t_vb_normals.c
+++ b/src/mesa/tnl/t_vb_normals.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -26,12 +26,11 @@
  */
 
 
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "macros.h"
-#include "imports.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/colormac.h"
+#include "main/macros.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 
@@ -39,7 +38,6 @@
 #include "t_pipeline.h"
 
 
-
 struct normal_stage_data {
    normal_func NormalTransform;
    GLvector4f normal;
@@ -48,10 +46,8 @@ struct normal_stage_data {
 #define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->privatePtr)
 
 
-
-
-static GLboolean run_normal_stage( GLcontext *ctx,
-                                  struct tnl_pipeline_stage *stage )
+static GLboolean
+run_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
@@ -63,60 +59,63 @@ static GLboolean run_normal_stage( GLcontext *ctx,
    /* We can only use the display list's saved normal lengths if we've
     * got a transformation matrix with uniform scaling.
     */
-   if (ctx->ModelviewMatrixStack.Top->flags & MAT_FLAG_GENERAL_SCALE)
+   if (_math_matrix_is_general_scale(ctx->ModelviewMatrixStack.Top))
       lengths = NULL;
    else
       lengths = VB->NormalLengthPtr;
 
    store->NormalTransform( ctx->ModelviewMatrixStack.Top,
                           ctx->_ModelViewInvScale,
-                          VB->NormalPtr,  /* input normals */
+                          VB->AttribPtr[_TNL_ATTRIB_NORMAL],  /* input normals */
                           lengths,
                           &store->normal ); /* resulting normals */
 
-   if (VB->NormalPtr->count > 1) {
-      store->normal.stride = 16;
+   if (VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count > 1) {
+      store->normal.stride = 4 * sizeof(GLfloat);
    }
    else {
       store->normal.stride = 0;
    }
 
-   VB->NormalPtr = &store->normal;
-   VB->AttribPtr[_TNL_ATTRIB_NORMAL] = VB->NormalPtr;
+   VB->AttribPtr[_TNL_ATTRIB_NORMAL] = &store->normal;
 
    VB->NormalLengthPtr = NULL; /* no longer valid */
    return GL_TRUE;
 }
 
 
-static void validate_normal_stage( GLcontext *ctx,
-                                           struct tnl_pipeline_stage *stage )
+/**
+ * Examine current GL state and set the store->NormalTransform pointer
+ * to point to the appropriate normal transformation routine.
+ */
+static void
+validate_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
 
-   if (ctx->VertexProgram._Enabled ||
+   if (ctx->VertexProgram._Current ||
        (!ctx->Light.Enabled &&
        !(ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS))) {
       store->NormalTransform = NULL;
       return;
    }
-      
-   
+
    if (ctx->_NeedEyeCoords) {
+      /* Eye coordinates are needed, for whatever reasons.
+       * Do lighting in eye coordinates, as the GL spec says.
+       */
       GLuint transform = NORM_TRANSFORM_NO_ROT;
 
-      if (ctx->ModelviewMatrixStack.Top->flags & (MAT_FLAG_GENERAL |
-                                 MAT_FLAG_ROTATION |
-                                 MAT_FLAG_GENERAL_3D |
-                                 MAT_FLAG_PERSPECTIVE))
+      if (_math_matrix_has_rotation(ctx->ModelviewMatrixStack.Top)) {
+         /* need to do full (3x3) matrix transform */
         transform = NORM_TRANSFORM;
-
+      }
 
       if (ctx->Transform.Normalize) {
         store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE];
       }
       else if (ctx->Transform.RescaleNormals &&
-              ctx->_ModelViewInvScale != 1.0) {
+               ctx->_ModelViewInvScale != 1.0) {
         store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE];
       }
       else {
@@ -124,6 +123,11 @@ static void validate_normal_stage( GLcontext *ctx,
       }
    }
    else {
+      /* We don't need eye coordinates.
+       * Do lighting in object coordinates.  Thus, we don't need to fully
+       * transform normal vectors (just leave them in object coordinates)
+       * but we still need to do normalization/rescaling if enabled.
+       */
       if (ctx->Transform.Normalize) {
         store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE];
       }
@@ -138,13 +142,16 @@ static void validate_normal_stage( GLcontext *ctx,
 }
 
 
-
-static GLboolean alloc_normal_data( GLcontext *ctx,
-                                struct tnl_pipeline_stage *stage )
+/**
+ * Allocate stage's private data (storage for transformed normals).
+ */
+static GLboolean
+alloc_normal_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct normal_stage_data *store;
-   stage->privatePtr = MALLOC(sizeof(*store));
+
+   stage->privatePtr = malloc(sizeof(*store));
    store = NORMAL_STAGE_DATA(stage);
    if (!store)
       return GL_FALSE;
@@ -154,13 +161,16 @@ static GLboolean alloc_normal_data( GLcontext *ctx,
 }
 
 
-
-static void free_normal_data( struct tnl_pipeline_stage *stage )
+/**
+ * Free stage's private data.
+ */
+static void
+free_normal_data(struct tnl_pipeline_stage *stage)
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
    if (store) {
       _mesa_vector4f_free( &store->normal );
-      FREE( store );
+      free( store );
       stage->privatePtr = NULL;
    }
 }
@@ -169,9 +179,9 @@ static void free_normal_data( struct tnl_pipeline_stage *stage )
 const struct tnl_pipeline_stage _tnl_normal_transform_stage =
 {
    "normal transform",         /* name */
-   NULL,                       /* private data */
-   alloc_normal_data,
-   free_normal_data,           /* destructor */
-   validate_normal_stage,      /* check */
-   run_normal_stage
+   NULL,                       /* privatePtr */
+   alloc_normal_data,          /* create */
+   free_normal_data,           /* destroy */
+   validate_normal_stage,      /* validate */
+   run_normal_stage             /* run */
 };