summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/fog.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-10-28 18:34:48 +0000
committerBrian Paul <[email protected]>2000-10-28 18:34:48 +0000
commitba643a2094a1e844b6ce60f468057057557859ce (patch)
tree27309b7362369d7339290f3702f4b7179be4c690 /src/mesa/main/fog.c
parenta897b335bec7465ab688ef369c75b468b7251b05 (diff)
Basic work to support deep color channels:
Replace GLubyte with GLchan Replace 255 with CHAN_MAX
Diffstat (limited to 'src/mesa/main/fog.c')
-rw-r--r--src/mesa/main/fog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 1353631adc4..a146a8f47a4 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -1,4 +1,4 @@
-/* $Id: fog.c,v 1.23 2000/10/28 11:42:12 keithw Exp $ */
+/* $Id: fog.c,v 1.24 2000/10/28 18:34:48 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -261,11 +261,11 @@ void
_mesa_fog_rgba_pixels( const GLcontext *ctx,
GLuint n,
const GLfixed fog[],
- GLubyte rgba[][4] )
+ GLchan rgba[][4] )
{
- GLfixed rFog = ctx->Fog.Color[0] * 255.0;
- GLfixed gFog = ctx->Fog.Color[1] * 255.0;
- GLfixed bFog = ctx->Fog.Color[2] * 255.0;
+ GLfixed rFog = ctx->Fog.Color[0] * CHAN_MAXF;
+ GLfixed gFog = ctx->Fog.Color[1] * CHAN_MAXF;
+ GLfixed bFog = ctx->Fog.Color[2] * CHAN_MAXF;
GLuint i;
for (i=0;i<n;i++) {
@@ -378,7 +378,7 @@ _mesa_win_fog_coords_from_z( const GLcontext *ctx,
*/
void
_mesa_depth_fog_rgba_pixels( const GLcontext *ctx,
- GLuint n, const GLdepth z[], GLubyte rgba[][4] )
+ GLuint n, const GLdepth z[], GLchan rgba[][4] )
{
GLfixed fog[MAX_WIDTH];
_mesa_win_fog_coords_from_z( ctx, n, z, fog );