Header file clean-up:

[mesa.git] / src / mesa / main / fog.c

diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index c0e4b4a907c324f06c36ee5b99f422903feba6ce..632a8ed32bb04c3c7a5a7b382fdc8a4ef247ddef 100644 (file)
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -1,10 +1,10 @@
-/* $Id: fog.c,v 1.32 2001/01/05 02:26:48 keithw Exp $ */
+/* $Id: fog.c,v 1.36 2002/10/24 23:57:20 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"),
@@ -25,15 +25,11 @@
  */
 
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
 #include "glheader.h"
 #include "colormac.h"
 #include "context.h"
 #include "fog.h"
 #include "mtypes.h"
-#endif
 
 
 
@@ -95,7 +91,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
         case GL_EXP2:
            break;
         default:
-           gl_error( ctx, GL_INVALID_ENUM, "glFog" );
+           _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
             return;
         }
         if (ctx->Fog.Mode == m)
@@ -105,7 +101,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
         break;
       case GL_FOG_DENSITY:
         if (*params<0.0) {
-           gl_error( ctx, GL_INVALID_VALUE, "glFog" );
+           _mesa_error( ctx, GL_INVALID_VALUE, "glFog" );
             return;
         }
         if (ctx->Fog.Density == *params)
@@ -132,7 +128,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
         ctx->Fog.Index = *params;
         break;
       case GL_FOG_COLOR:
-        if (TEST_EQ_4V(ctx->Fog.Color, params)) 
+        if (TEST_EQ_4V(ctx->Fog.Color, params))
            return;
         FLUSH_VERTICES(ctx, _NEW_FOG);
         ctx->Fog.Color[0] = params[0];
@@ -141,9 +137,10 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
         ctx->Fog.Color[3] = params[3];
          break;
       case GL_FOG_COORDINATE_SOURCE_EXT: {
-        GLenum p = (GLenum)(GLint) *params;
-        if (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT) {
-           gl_error( ctx, GL_INVALID_ENUM, "glFog" );
+        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)
@@ -153,7 +150,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
         break;
       }
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glFog" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
          return;
    }
 
@@ -161,5 +158,3 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
       (*ctx->Driver.Fogfv)( ctx, pname, params );
    }
 }
-
-