lots of gl_*() to _mesa_*() namespace clean-up
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 052c046..a7fce7e 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.38 2001/02/16 18:14:41 keithw Exp $ */
+/* $Id: light.c,v 1.39 2001/03/03 20:33:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -57,10 +57,10 @@
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glShadeModel %s\n", gl_lookup_enum_by_nr(mode));
+ fprintf(stderr, "glShadeModel %s\n", _mesa_lookup_enum_by_nr(mode));
if (mode != GL_FLAT && mode != GL_SMOOTH) {
- gl_error( ctx, GL_INVALID_ENUM, "glShadeModel" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glShadeModel" );
return;
}
@@ -91,7 +91,7 @@
struct gl_light *l = &ctx->Light.Light[i];
if (i < 0 || i >= ctx->Const.MaxLights) {
- gl_error( ctx, GL_INVALID_ENUM, "glLight" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glLight" );
return;
}
@@ -143,18 +143,18 @@
}
case GL_SPOT_EXPONENT:
if (params[0]<0.0 || params[0]>128.0) {
- gl_error( ctx, GL_INVALID_VALUE, "glLight" );
+ _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
return;
}
if (l->SpotExponent == params[0])
return;
FLUSH_VERTICES(ctx, _NEW_LIGHT);
l->SpotExponent = params[0];
- gl_invalidate_spot_exp_table( l );
+ _mesa_invalidate_spot_exp_table( l );
break;
case GL_SPOT_CUTOFF:
if ((params[0]<0.0 || params[0]>90.0) && params[0]!=180.0) {
- gl_error( ctx, GL_INVALID_VALUE, "glLight" );
+ _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
return;
}
if (l->SpotCutoff == params[0])
@@ -171,7 +171,7 @@
break;
case GL_CONSTANT_ATTENUATION:
if (params[0]<0.0) {
- gl_error( ctx, GL_INVALID_VALUE, "glLight" );
+ _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
return;
}
if (l->ConstantAttenuation == params[0])
@@ -181,7 +181,7 @@
break;
case GL_LINEAR_ATTENUATION:
if (params[0]<0.0) {
- gl_error( ctx, GL_INVALID_VALUE, "glLight" );
+ _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
return;
}
if (l->LinearAttenuation == params[0])
@@ -191,7 +191,7 @@
break;
case GL_QUADRATIC_ATTENUATION:
if (params[0]<0.0) {
- gl_error( ctx, GL_INVALID_VALUE, "glLight" );
+ _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
return;
}
if (l->QuadraticAttenuation == params[0])
@@ -200,7 +200,7 @@
l->QuadraticAttenuation = params[0];
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glLight" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glLight" );
return;
}
@@ -266,7 +266,7 @@
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (l < 0 || l >= ctx->Const.MaxLights) {
- gl_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
return;
}
@@ -302,7 +302,7 @@
params[0] = ctx->Light.Light[l].QuadraticAttenuation;
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
break;
}
}
@@ -317,7 +317,7 @@
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (l < 0 || l >= ctx->Const.MaxLights) {
- gl_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
return;
}
@@ -367,7 +367,7 @@
params[0] = (GLint) ctx->Light.Light[l].QuadraticAttenuation;
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
break;
}
}
@@ -414,7 +414,7 @@
else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR)
newenum = GL_SEPARATE_SPECULAR_COLOR;
else {
- gl_error( ctx, GL_INVALID_ENUM, "glLightModel(param)" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(param)" );
return;
}
if (ctx->Light.Model.ColorControl == newenum)
@@ -431,7 +431,7 @@
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glLightModel" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel" );
break;
}
@@ -487,9 +487,9 @@
* Given a face and pname value (ala glColorMaterial), compute a bitmask
* of the targeted material values.
*/
-GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
- GLuint legal,
- const char *where )
+GLuint
+_mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
+ GLuint legal, const char *where )
{
GLuint bitmask = 0;
@@ -518,7 +518,7 @@
bitmask |= FRONT_INDEXES_BIT | BACK_INDEXES_BIT;
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, where );
+ _mesa_error( ctx, GL_INVALID_ENUM, where );
return 0;
}
@@ -529,12 +529,12 @@
bitmask &= BACK_MATERIAL_BITS;
}
else if (face != GL_FRONT_AND_BACK) {
- gl_error( ctx, GL_INVALID_ENUM, where );
+ _mesa_error( ctx, GL_INVALID_ENUM, where );
return 0;
}
if (bitmask & ~legal) {
- gl_error( ctx, GL_INVALID_ENUM, where );
+ _mesa_error( ctx, GL_INVALID_ENUM, where );
return 0;
}
@@ -544,7 +544,7 @@
/* Perform a straight copy between pairs of materials.
*/
-void gl_copy_material_pairs( struct gl_material dst[2],
+void _mesa_copy_material_pairs( struct gl_material dst[2],
const struct gl_material src[2],
GLuint bitmask )
{
@@ -602,7 +602,7 @@
*
* Additionally keeps the precomputed lighting state uptodate.
*/
-void gl_update_material( GLcontext *ctx,
+void _mesa_update_material( GLcontext *ctx,
const struct gl_material src[2],
GLuint bitmask )
{
@@ -612,7 +612,7 @@
bitmask &= ~ctx->Light.ColorMaterialBitmask;
if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
- fprintf(stderr, "gl_update_material, mask 0x%x\n", bitmask);
+ fprintf(stderr, "_mesa_update_material, mask 0x%x\n", bitmask);
if (!bitmask)
return;
@@ -693,11 +693,11 @@
if (bitmask & FRONT_SHININESS_BIT) {
ctx->Light.Material[0].Shininess = src[0].Shininess;
- gl_invalidate_shine_table( ctx, 0 );
+ _mesa_invalidate_shine_table( ctx, 0 );
}
if (bitmask & BACK_SHININESS_BIT) {
ctx->Light.Material[1].Shininess = src[1].Shininess;
- gl_invalidate_shine_table( ctx, 1 );
+ _mesa_invalidate_shine_table( ctx, 1 );
}
if (bitmask & FRONT_INDEXES_BIT) {
@@ -744,7 +744,7 @@
* according to the bitmask in ColorMaterialBitmask, which is
* set by glColorMaterial().
*/
-void gl_update_color_material( GLcontext *ctx,
+void _mesa_update_color_material( GLcontext *ctx,
const GLchan rgba[4] )
{
struct gl_light *light, *list = &ctx->Light.EnabledList;
@@ -757,7 +757,7 @@
color[3] = CHAN_TO_FLOAT(rgba[3]);
if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
- fprintf(stderr, "gl_update_color_material, mask 0x%x\n", bitmask);
+ fprintf(stderr, "_mesa_update_color_material, mask 0x%x\n", bitmask);
/* update emissive colors */
if (bitmask & FRONT_EMISSION_BIT) {
@@ -874,10 +874,10 @@
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glColorMaterial %s %s\n",
- gl_lookup_enum_by_nr(face),
- gl_lookup_enum_by_nr(mode));
+ _mesa_lookup_enum_by_nr(face),
+ _mesa_lookup_enum_by_nr(mode));
- bitmask = gl_material_bitmask( ctx, face, mode, legal, "glColorMaterial" );
+ bitmask = _mesa_material_bitmask(ctx, face, mode, legal, "glColorMaterial");
if (ctx->Light.ColorMaterialBitmask == bitmask &&
ctx->Light.ColorMaterialFace == face &&
@@ -891,7 +891,7 @@
if (ctx->Light.ColorMaterialEnabled) {
FLUSH_CURRENT( ctx, 0 );
- gl_update_color_material( ctx, ctx->Current.Color );
+ _mesa_update_color_material( ctx, ctx->Current.Color );
}
}
@@ -913,7 +913,7 @@
f = 1;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(face)" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(face)" );
return;
}
switch (pname) {
@@ -938,7 +938,7 @@
params[2] = ctx->Light.Material[f].SpecularIndex;
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
}
}
@@ -958,7 +958,7 @@
f = 1;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetMaterialiv(face)" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialiv(face)" );
return;
}
switch (pname) {
@@ -995,7 +995,7 @@
params[2] = ROUNDF( ctx->Light.Material[f].SpecularIndex );
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
}
}
@@ -1046,7 +1046,7 @@
* this function to recompute the exponent lookup table.
*/
void
-gl_invalidate_spot_exp_table( struct gl_light *l )
+_mesa_invalidate_spot_exp_table( struct gl_light *l )
{
l->_SpotExpTable[0][0] = -1;
}
@@ -1085,7 +1085,7 @@
* by keeping a MRU cache of shine tables for various shine values.
*/
void
-gl_invalidate_shine_table( GLcontext *ctx, GLuint i )
+_mesa_invalidate_shine_table( GLcontext *ctx, GLuint i )
{
if (ctx->_ShineTable[i])
ctx->_ShineTable[i]->refcount--;
@@ -1141,7 +1141,7 @@
}
void
-gl_validate_all_lighting_tables( GLcontext *ctx )
+_mesa_validate_all_lighting_tables( GLcontext *ctx )
{
GLint i;
GLfloat shininess;
@@ -1169,7 +1169,7 @@
* source and material ambient, diffuse and specular coefficients.
*/
void
-gl_update_lighting( GLcontext *ctx )
+_mesa_update_lighting( GLcontext *ctx )
{
struct gl_light *light;
ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
@@ -1255,7 +1255,7 @@
* Also update on lighting space changes.
*/
void
-gl_compute_light_positions( GLcontext *ctx )
+_mesa_compute_light_positions( GLcontext *ctx )
{
struct gl_light *light;
static const GLfloat eye_z[3] = { 0, 0, 1 };