-/* $Id: t_vb_fog.c,v 1.3 2001/02/06 04:06:36 keithw Exp $ */
+/* $Id: t_vb_fog.c,v 1.12 2001/09/14 21:30:31 brianp 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"),
* 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:
+ * Authors:
* Keith Whitwell <keithw@valinux.com>
*/
GLvector1f input; /* points into VB->EyePtr Z values */
};
-#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->private)
+#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)
#define FOG_EXP_TABLE_SIZE 256
-#define FOG_MAX (5.0)
+#define FOG_MAX (10.0)
#define EXP_FOG_MAX .0006595
#define FOG_INCR (FOG_MAX/FOG_EXP_TABLE_SIZE)
static GLfloat exp_table[FOG_EXP_TABLE_SIZE];
#if 1
#define NEG_EXP( result, narg ) \
do { \
- float f = (narg * (1.0/FOG_INCR)); \
- int k = (int) f; \
+ GLfloat f = (GLfloat) (narg * (1.0/FOG_INCR)); \
+ GLint k = (GLint) f; \
if (k > FOG_EXP_TABLE_SIZE-2) \
- result = EXP_FOG_MAX; \
+ result = (GLfloat) EXP_FOG_MAX; \
else \
result = exp_table[k] + (f-k)*(exp_table[k+1]-exp_table[k]); \
} while (0)
static void init_static_data( void )
{
- float f = 0;
- int i = 0;
+ GLfloat f = 0.0F;
+ GLint i = 0;
for ( ; i < FOG_EXP_TABLE_SIZE ; i++, f += FOG_INCR) {
- exp_table[i] = exp(-f);
+ exp_table[i] = (GLfloat) exp(-f);
}
inited = 1;
}
-static void make_win_fog_coords( GLcontext *ctx, GLvector1f *out,
+static void make_win_fog_coords( GLcontext *ctx, GLvector1f *out,
const GLvector1f *in )
{
GLfloat end = ctx->Fog.End;
GLfloat *v = in->start;
GLuint stride = in->stride;
GLuint n = in->count;
- GLfloat *data = out->data;
+ GLfloat *data = out->data;
GLfloat d;
GLuint i;
d = 1.0F;
else
d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
- for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride))
- data[i] = (end - ABSF(*v)) * d;
+ for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
+ GLfloat f = (end - ABSF(*v)) * d;
+ data[i] = CLAMP(f, 0.0F, 1.0F);
+ }
break;
case GL_EXP:
d = ctx->Fog.Density;
- for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride))
- NEG_EXP( data[i], d*ABSF(*v) );
+ for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride))
+ NEG_EXP( data[i], d * ABSF(*v) );
break;
case GL_EXP2:
d = ctx->Fog.Density*ctx->Fog.Density;
for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
- GLfloat z = *v;
- NEG_EXP( data[i], d*z*z );
+ GLfloat z = *v;
+ NEG_EXP( data[i], d * z * z );
}
break;
default:
- gl_problem(ctx, "Bad fog mode in make_fog_coord");
+ _mesa_problem(ctx, "Bad fog mode in make_fog_coord");
return;
}
}
-static GLboolean run_fog_stage( GLcontext *ctx,
+static GLboolean run_fog_stage( GLcontext *ctx,
struct gl_pipeline_stage *stage )
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct fog_stage_data *store = FOG_STAGE_DATA(stage);
GLvector1f *input;
- VB->FogCoordPtr = &store->fogcoord;
-
if (stage->changed_inputs == 0)
return GL_TRUE;
if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT) {
+ /* fog computed from Z depth */
+ /* source = VB->ObjPtr or VB->EyePtr coords */
+ /* dest = VB->FogCoordPtr = fog stage private storage */
+ VB->FogCoordPtr = &store->fogcoord;
+
if (!ctx->_NeedEyeCoords) {
GLfloat *m = ctx->ModelView.m;
GLfloat plane[4];
-
+
/* Use this to store calculated eye z values:
*/
input = &store->fogcoord;
/* Full eye coords weren't required, just calculate the
* eye Z values.
*/
- gl_dotprod_tab[0][VB->ObjPtr->size](input->data, sizeof(GLfloat),
- VB->ObjPtr, plane, 0 );
+ _mesa_dotprod_tab[VB->ObjPtr->size]( input->data,
+ sizeof(GLfloat),
+ VB->ObjPtr, plane );
input->count = VB->ObjPtr->count;
}
input = &store->input;
if (VB->EyePtr->size < 2)
- gl_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
+ _mesa_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
input->data = &(VB->EyePtr->data[0][2]);
input->start = VB->EyePtr->start+2;
input->stride = VB->EyePtr->stride;
input->count = VB->EyePtr->count;
}
- } else
+ } else {
+ /* use glFogCoord() coordinates */
+ /* source = VB->FogCoordPtr */
input = VB->FogCoordPtr;
+ /* dest = fog stage private storage */
+ VB->FogCoordPtr = &store->fogcoord;
+ }
make_win_fog_coords( ctx, VB->FogCoordPtr, input );
return GL_TRUE;
/* Called the first time stage->run() is invoked.
*/
-static GLboolean alloc_fog_data( GLcontext *ctx,
+static GLboolean alloc_fog_data( GLcontext *ctx,
struct gl_pipeline_stage *stage )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct fog_stage_data *store;
- stage->private = MALLOC(sizeof(*store));
+ stage->privatePtr = MALLOC(sizeof(*store));
store = FOG_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
- gl_vector1f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
- gl_vector1f_init( &store->input, 0, 0 );
+ _mesa_vector1f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
+ _mesa_vector1f_init( &store->input, 0, 0 );
if (!inited)
init_static_data();
{
struct fog_stage_data *store = FOG_STAGE_DATA(stage);
if (store) {
- gl_vector1f_free( &store->fogcoord );
+ _mesa_vector1f_free( &store->fogcoord );
FREE( store );
- stage->private = 0;
+ stage->privatePtr = NULL;
}
}
-const struct gl_pipeline_stage _tnl_fog_coordinate_stage =
-{
+const struct gl_pipeline_stage _tnl_fog_coordinate_stage =
+{
"build fog coordinates",
_NEW_FOG,
- _NEW_FOG,
+ _NEW_FOG,
0, 0, VERT_FOG_COORD, /* active, inputs, outputs */
0, 0, /* changed_inputs, private_data */
free_fog_data, /* dtr */
projects / mesa.git / blobdiff