summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/context.c4
-rw-r--r--src/mesa/main/fog.c22
-rw-r--r--src/mesa/main/fog.h23
3 files changed, 30 insertions, 19 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d40f45130d1..032a3ad6598 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.39 2000/02/02 19:50:26 brianp Exp $ */
+/* $Id: context.c,v 1.40 2000/02/02 22:21:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -440,7 +440,7 @@ static void one_time_init( void )
gl_init_clip();
gl_init_eval();
- gl_init_fog();
+ _mesa_init_fog();
gl_init_math();
gl_init_lists();
gl_init_shade();
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index e1a69f3b0d9..b424f8eeeb3 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -1,10 +1,10 @@
-/* $Id: fog.c,v 1.4 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: fog.c,v 1.5 2000/02/02 22:21:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2000 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"),
@@ -172,16 +172,20 @@ static fog_func fog_rgba_tab[2];
#define IDX 1
#include "fog_tmp.h"
-void gl_init_fog( void )
+
+void
+_mesa_init_fog( void )
{
init_fog_tab_masked();
init_fog_tab_raw();
}
+
/*
* Compute fog for the vertices in the vertex buffer.
*/
-void gl_fog_vertices( struct vertex_buffer *VB )
+void
+_mesa_fog_vertices( struct vertex_buffer *VB )
{
GLcontext *ctx = VB->ctx;
GLuint i = VB->CullMode & 1;
@@ -213,8 +217,9 @@ void gl_fog_vertices( struct vertex_buffer *VB )
* red, green, blue, alpha - pixel colors
* Output: red, green, blue, alpha - fogged pixel colors
*/
-void gl_fog_rgba_pixels( const GLcontext *ctx,
- GLuint n, const GLdepth z[], GLubyte rgba[][4] )
+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];
@@ -298,8 +303,9 @@ void gl_fog_rgba_pixels( const GLcontext *ctx,
* index - pixel color indexes
* Output: index - fogged pixel color indexes
*/
-void gl_fog_ci_pixels( const GLcontext *ctx,
- GLuint n, const GLdepth z[], GLuint index[] )
+void
+_mesa_fog_ci_pixels( const GLcontext *ctx,
+ GLuint n, const GLdepth z[], GLuint index[] )
{
GLfloat c = ctx->ProjectionMatrix.m[10];
GLfloat d = ctx->ProjectionMatrix.m[14];
diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index 0bb4d9d72aa..92a2bc5d33d 100644
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -1,10 +1,10 @@
-/* $Id: fog.h,v 1.2 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: fog.h,v 1.3 2000/02/02 22:21:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2000 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"),
@@ -49,16 +49,21 @@ _mesa_Fogiv(GLenum pname, const GLint *params );
-extern void gl_fog_vertices( struct vertex_buffer *VB );
+extern void
+_mesa_fog_vertices( struct vertex_buffer *VB );
-extern void gl_fog_rgba_pixels( const GLcontext *ctx,
- GLuint n, const GLdepth z[],
- GLubyte rgba[][4] );
+extern void
+_mesa_fog_rgba_pixels( const GLcontext *ctx,
+ GLuint n, const GLdepth z[],
+ GLubyte rgba[][4] );
-extern void gl_fog_ci_pixels( const GLcontext *ctx,
- GLuint n, const GLdepth z[], GLuint indx[] );
+extern void
+_mesa_fog_ci_pixels( const GLcontext *ctx,
+ GLuint n, const GLdepth z[], GLuint indx[] );
-extern void gl_init_fog( void );
+extern void
+_mesa_init_fog( void );
+
#endif