-/* $Id: t_vb_normals.c,v 1.2 2000/12/27 19:57:37 keithw Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 6.1
*
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 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"),
* 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.
*
- * Author:
- * Keith Whitwell <keithw@valinux.com>
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
*/
#include "colormac.h"
#include "context.h"
#include "macros.h"
-#include "mem.h"
-#include "mmath.h"
+#include "imports.h"
#include "mtypes.h"
#include "math/m_xform.h"
struct normal_stage_data {
- normal_func *NormalTransform;
- GLvector3f normal;
+ normal_func NormalTransform;
+ GLvector4f normal;
};
-#define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->private)
+#define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->privatePtr)
-static GLboolean run_normal_stage( GLcontext *ctx,
- struct gl_pipeline_stage *stage )
+static GLboolean run_normal_stage( GLcontext *ctx,
+ struct tnl_pipeline_stage *stage )
{
struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
ASSERT(store->NormalTransform);
- if (VB->NormalLengthPtr) {
- GLfloat diff = VB->NormalLengthPtr[0] -
- 1.0/LEN_3FV(VB->NormalPtr->data[0]);
- (void)diff;
- ASSERT((diff*diff) < .01);
+ if (stage->changed_inputs) {
+ /* We can only use the display list's saved normal lengths if we've
+ * got a transformation matrix with uniform scaling.
+ */
+ const GLfloat *lengths;
+ if (ctx->ModelviewMatrixStack.Top->flags & MAT_FLAG_GENERAL_SCALE)
+ lengths = NULL;
+ else
+ lengths = VB->NormalLengthPtr;
+
+ store->NormalTransform( ctx->ModelviewMatrixStack.Top,
+ ctx->_ModelViewInvScale,
+ VB->NormalPtr, /* input normals */
+ lengths,
+ &store->normal ); /* resulting normals */
+
+ if (VB->NormalPtr->count > 1) {
+ store->normal.stride = 16;
+ }
+ else {
+ store->normal.stride = 0;
+ }
}
- if (stage->changed_inputs)
- (store->NormalTransform[0])(&ctx->ModelView,
- ctx->_ModelViewInvScale,
- VB->NormalPtr,
- VB->NormalLengthPtr,
- 0,
- &store->normal);
-
VB->NormalPtr = &store->normal;
+ VB->AttribPtr[_TNL_ATTRIB_NORMAL] = VB->NormalPtr;
+
+ VB->NormalLengthPtr = 0; /* no longer valid */
return GL_TRUE;
}
-static GLboolean run_validate_normal_stage( GLcontext *ctx,
- struct gl_pipeline_stage *stage)
+static GLboolean run_validate_normal_stage( GLcontext *ctx,
+ struct tnl_pipeline_stage *stage )
{
struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
- ASSERT(ctx->_NeedNormals);
if (ctx->_NeedEyeCoords) {
GLuint transform = NORM_TRANSFORM_NO_ROT;
- if (ctx->ModelView.flags & (MAT_FLAG_GENERAL |
+ if (ctx->ModelviewMatrixStack.Top->flags & (MAT_FLAG_GENERAL |
MAT_FLAG_ROTATION |
MAT_FLAG_GENERAL_3D |
MAT_FLAG_PERSPECTIVE))
transform = NORM_TRANSFORM;
-
-
+
+
if (ctx->Transform.Normalize) {
- store->NormalTransform = gl_normal_tab[transform | NORM_NORMALIZE];
+ store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE];
}
else if (ctx->Transform.RescaleNormals &&
ctx->_ModelViewInvScale != 1.0) {
- store->NormalTransform = gl_normal_tab[transform | NORM_RESCALE];
+ store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE];
}
else {
- store->NormalTransform = gl_normal_tab[transform];
+ store->NormalTransform = _mesa_normal_tab[transform];
}
}
else {
if (ctx->Transform.Normalize) {
- store->NormalTransform = gl_normal_tab[NORM_NORMALIZE];
+ store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE];
}
else if (!ctx->Transform.RescaleNormals &&
ctx->_ModelViewInvScale != 1.0) {
- store->NormalTransform = gl_normal_tab[NORM_RESCALE];
+ store->NormalTransform = _mesa_normal_tab[NORM_RESCALE];
}
else {
store->NormalTransform = 0;
static void check_normal_transform( GLcontext *ctx,
- struct gl_pipeline_stage *stage )
+ struct tnl_pipeline_stage *stage )
{
- stage->active = ctx->_NeedNormals;
+ stage->active = !ctx->VertexProgram._Enabled &&
+ (ctx->Light.Enabled || (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS));
+
/* Don't clobber the initialize function:
*/
- if (stage->private)
+ if (stage->privatePtr)
stage->run = run_validate_normal_stage;
}
-static GLboolean alloc_normal_data( GLcontext *ctx,
- struct gl_pipeline_stage *stage )
+static GLboolean alloc_normal_data( GLcontext *ctx,
+ struct tnl_pipeline_stage *stage )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct normal_stage_data *store;
- stage->private = MALLOC(sizeof(*store));
+ stage->privatePtr = MALLOC(sizeof(*store));
store = NORMAL_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
- gl_vector3f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
+ _mesa_vector4f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
/* Now run the stage.
*/
-static void free_normal_data( struct gl_pipeline_stage *stage )
+static void free_normal_data( struct tnl_pipeline_stage *stage )
{
struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
if (store) {
- gl_vector3f_free( &store->normal );
+ _mesa_vector4f_free( &store->normal );
FREE( store );
- stage->private = 0;
+ stage->privatePtr = NULL;
}
}
#define _TNL_NEW_NORMAL_TRANSFORM (_NEW_MODELVIEW| \
_NEW_TRANSFORM| \
+ _NEW_PROGRAM| \
_MESA_NEW_NEED_NORMALS| \
_MESA_NEW_NEED_EYE_COORDS)
-const struct gl_pipeline_stage _tnl_normal_transform_stage =
-{
- "normal transform",
+const struct tnl_pipeline_stage _tnl_normal_transform_stage =
+{
+ "normal transform", /* name */
_TNL_NEW_NORMAL_TRANSFORM, /* re-check */
_TNL_NEW_NORMAL_TRANSFORM, /* re-run */
- 0,VERT_NORM,VERT_NORM, /* active, inputs, outputs */
- 0, 0, /* changed_inputs, private */
+ GL_FALSE, /* active? */
+ _TNL_BIT_NORMAL, /* inputs */
+ _TNL_BIT_NORMAL, /* outputs */
+ 0, /* changed_inputs */
+ NULL, /* private data */
free_normal_data, /* destructor */
check_normal_transform, /* check */
alloc_normal_data /* run -- initially set to alloc */
};
-
projects / mesa.git / blobdiff