X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ffog.c;h=d3b8a923aae6e15ede9d4f9143c205836e0565c8;hb=c1f2f9090bcca309b9aeef7ae57acc280704db81;hp=9a2520d60665946ebe5cf28d962a19a1e355ff6a;hpb=ab8de7b678f2e1954ef83e7339d388c8f2f55a4f;p=mesa.git diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index 9a2520d6066..d3b8a923aae 100644 --- a/src/mesa/main/fog.c +++ b/src/mesa/main/fog.c @@ -1,21 +1,19 @@ -/* $Id: fog.c,v 1.6 2000/02/02 22:22:59 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * Version: 5.1 + * + * Copyright (C) 1999-2003 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 @@ -25,27 +23,22 @@ */ -#ifdef PC_HEADER -#include "all.h" -#else #include "glheader.h" +#include "colormac.h" #include "context.h" #include "fog.h" -#include "macros.h" -#include "mmath.h" -#include "types.h" -#endif +#include "mtypes.h" -void +void GLAPIENTRY _mesa_Fogf(GLenum pname, GLfloat param) { _mesa_Fogfv(pname, ¶m); } -void +void GLAPIENTRY _mesa_Fogi(GLenum pname, GLint param ) { GLfloat fparam = (GLfloat) param; @@ -53,7 +46,7 @@ _mesa_Fogi(GLenum pname, GLint param ) } -void +void GLAPIENTRY _mesa_Fogiv(GLenum pname, const GLint *params ) { GLfloat p[4]; @@ -63,6 +56,7 @@ _mesa_Fogiv(GLenum pname, const GLint *params ) case GL_FOG_START: case GL_FOG_END: case GL_FOG_INDEX: + case GL_FOG_COORDINATE_SOURCE_EXT: p[0] = (GLfloat) *params; break; case GL_FOG_COLOR: @@ -79,294 +73,105 @@ _mesa_Fogiv(GLenum pname, const GLint *params ) } -void +void GLAPIENTRY _mesa_Fogfv( GLenum pname, const GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); GLenum m; + ASSERT_OUTSIDE_BEGIN_END(ctx); switch (pname) { case GL_FOG_MODE: m = (GLenum) (GLint) *params; - if (m==GL_LINEAR || m==GL_EXP || m==GL_EXP2) { - ctx->Fog.Mode = m; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glFog" ); + switch (m) { + case GL_LINEAR: + case GL_EXP: + case GL_EXP2: + break; + default: + _mesa_error( ctx, GL_INVALID_ENUM, "glFog" ); return; } + if (ctx->Fog.Mode == m) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); + ctx->Fog.Mode = m; break; case GL_FOG_DENSITY: if (*params<0.0) { - gl_error( ctx, GL_INVALID_VALUE, "glFog" ); + _mesa_error( ctx, GL_INVALID_VALUE, "glFog" ); return; } - else { - ctx->Fog.Density = *params; - } + if (ctx->Fog.Density == *params) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); + ctx->Fog.Density = *params; break; case GL_FOG_START: -#if 0 - /* Prior to OpenGL 1.1, this was an error */ - if (*params<0.0F) { - gl_error( ctx, GL_INVALID_VALUE, "glFog(GL_FOG_START)" ); - return; - } -#endif + if (ctx->Fog.Start == *params) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.Start = *params; break; case GL_FOG_END: -#if 0 - /* Prior to OpenGL 1.1, this was an error */ - if (*params<0.0F) { - gl_error( ctx, GL_INVALID_VALUE, "glFog(GL_FOG_END)" ); - return; - } -#endif + if (ctx->Fog.End == *params) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.End = *params; break; case GL_FOG_INDEX: - ctx->Fog.Index = *params; + if (ctx->Fog.Index == *params) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); + ctx->Fog.Index = *params; break; case GL_FOG_COLOR: - ctx->Fog.Color[0] = params[0]; - ctx->Fog.Color[1] = params[1]; - ctx->Fog.Color[2] = params[2]; - ctx->Fog.Color[3] = params[3]; + if (TEST_EQ_4V(ctx->Fog.Color, params)) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); + ctx->Fog.Color[0] = CLAMP(params[0], 0.0F, 1.0F); + ctx->Fog.Color[1] = CLAMP(params[1], 0.0F, 1.0F); + ctx->Fog.Color[2] = CLAMP(params[2], 0.0F, 1.0F); + ctx->Fog.Color[3] = CLAMP(params[3], 0.0F, 1.0F); break; + case GL_FOG_COORDINATE_SOURCE_EXT: { + GLenum p = (GLenum) (GLint) *params; + if (!ctx->Extensions.EXT_fog_coord || + (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) { + _mesa_error(ctx, GL_INVALID_ENUM, "glFog"); + return; + } + if (ctx->Fog.FogCoordinateSource == p) + return; + FLUSH_VERTICES(ctx, _NEW_FOG); + ctx->Fog.FogCoordinateSource = p; + break; + } default: - gl_error( ctx, GL_INVALID_ENUM, "glFog" ); + _mesa_error( ctx, GL_INVALID_ENUM, "glFog" ); return; } if (ctx->Driver.Fogfv) { (*ctx->Driver.Fogfv)( ctx, pname, params ); } - - ctx->NewState |= NEW_FOG; -} - - -typedef void (*fog_func)( struct vertex_buffer *VB, GLuint side, - GLubyte flag ); - - -static fog_func fog_ci_tab[2]; -static fog_func fog_rgba_tab[2]; - -/* - * Compute the fogged color for an array of vertices. - * Input: n - number of vertices - * v - array of vertices - * color - the original vertex colors - * Output: color - the fogged colors - * - */ -#define TAG(x) x##_raw -#define CULLCHECK -#define IDX 0 -#include "fog_tmp.h" - -#define TAG(x) x##_masked -#define CULLCHECK if (cullmask[i]&flag) -#define IDX 1 -#include "fog_tmp.h" - - -void -_mesa_init_fog( void ) -{ - init_fog_tab_masked(); - init_fog_tab_raw(); -} - - -/* - * Compute fog for the vertices in the vertex buffer. - */ -void -_mesa_fog_vertices( struct vertex_buffer *VB ) -{ - GLcontext *ctx = VB->ctx; - GLuint i = VB->CullMode & 1; - - if (ctx->Visual->RGBAflag) { - /* Fog RGB colors */ - if (ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE) { - fog_rgba_tab[i]( VB, 0, VERT_FACE_FRONT ); - fog_rgba_tab[i]( VB, 1, VERT_FACE_REAR ); - } else { - fog_rgba_tab[i]( VB, 0, VERT_FACE_FRONT|VERT_FACE_REAR ); - } - } - else { - /* Fog color indexes */ - if (ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE) { - fog_ci_tab[i]( VB, 0, VERT_FACE_FRONT ); - fog_ci_tab[i]( VB, 1, VERT_FACE_REAR ); - } else { - fog_ci_tab[i]( VB, 0, VERT_FACE_FRONT|VERT_FACE_REAR ); - } - } -} - -/* - * Apply fog to an array of RGBA pixels. - * Input: n - number of pixels - * z - array of integer depth values - * red, green, blue, alpha - pixel colors - * Output: red, green, blue, alpha - fogged pixel colors - */ -void -_mesa_fog_rgba_pixels( const GLcontext *ctx, - GLuint n, const GLdepth z[], GLubyte rgba[][4] ) -{ - GLfloat c = ctx->ProjectionMatrix.m[10]; - GLfloat d = ctx->ProjectionMatrix.m[14]; - GLuint i; - - GLfloat rFog = ctx->Fog.Color[0] * 255.0F; - GLfloat gFog = ctx->Fog.Color[1] * 255.0F; - GLfloat bFog = ctx->Fog.Color[2] * 255.0F; - - GLfloat tz = ctx->Viewport.WindowMap.m[MAT_TZ]; - GLfloat szInv = 1.0F / ctx->Viewport.WindowMap.m[MAT_SZ]; - - switch (ctx->Fog.Mode) { - case GL_LINEAR: - { - GLfloat fogEnd = ctx->Fog.End; - GLfloat fogScale = 1.0F / (ctx->Fog.End - ctx->Fog.Start); - for (i=0;iFog.Density * eyez ); - g = 1.0F - f; - rgba[i][RCOMP] = (GLint) (f * rgba[i][RCOMP] + g * rFog); - rgba[i][GCOMP] = (GLint) (f * rgba[i][GCOMP] + g * gFog); - rgba[i][BCOMP] = (GLint) (f * rgba[i][BCOMP] + g * bFog); - } - break; - case GL_EXP2: - { - GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density; - for (i=0;iProjectionMatrix.m[10]; - GLfloat d = ctx->ProjectionMatrix.m[14]; - GLuint i; - - GLfloat tz = ctx->Viewport.WindowMap.m[MAT_TZ]; - GLfloat szInv = 1.0F / ctx->Viewport.WindowMap.m[MAT_SZ]; - - switch (ctx->Fog.Mode) { - case GL_LINEAR: - { - GLfloat fogEnd = ctx->Fog.End; - GLfloat fogScale = 1.0F / (ctx->Fog.End - ctx->Fog.Start); - for (i=0;iFog.Index); - } - } - break; - case GL_EXP: - for (i=0;iFog.Density * eyez ); - f = CLAMP( f, 0.0F, 1.0F ); - index[i] = (GLuint) ((GLfloat) index[i] + (1.0F-f) * ctx->Fog.Index); - } - break; - case GL_EXP2: - { - GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density; - for (i=0;iFog.Index); - } - } - break; - default: - gl_problem(ctx, "Bad fog mode in _mesa_fog_ci_pixels"); - return; - } + /* Fog group */ + ctx->Fog.Enabled = GL_FALSE; + ctx->Fog.Mode = GL_EXP; + ASSIGN_4V( ctx->Fog.Color, 0.0, 0.0, 0.0, 0.0 ); + ctx->Fog.Index = 0.0; + ctx->Fog.Density = 1.0; + ctx->Fog.Start = 0.0; + ctx->Fog.End = 1.0; + ctx->Fog.ColorSumEnabled = GL_FALSE; + ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT; } -