projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Use bitmask/ffs to iterate the enabled textures.
[mesa.git]
/
src
/
mesa
/
main
/
fog.c
diff --git
a/src/mesa/main/fog.c
b/src/mesa/main/fog.c
index 7601651c38ef0afe23c427c796771683a777f76f..1ad939cfde6ccd953647aee237ac025b3c65ff05 100644
(file)
--- a/
src/mesa/main/fog.c
+++ b/
src/mesa/main/fog.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 5.1
*
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
@@
-25,7
+24,6
@@
#include "glheader.h"
#include "glheader.h"
-#include "colormac.h"
#include "context.h"
#include "fog.h"
#include "macros.h"
#include "context.h"
#include "fog.h"
#include "macros.h"
@@
-117,7
+115,7
@@
_mesa_Fogfv( GLenum pname, const GLfloat *params )
ctx->Fog.Mode = m;
break;
case GL_FOG_DENSITY:
ctx->Fog.Mode = m;
break;
case GL_FOG_DENSITY:
- if (*params<0.0) {
+ if (*params<0.0
F
) {
_mesa_error( ctx, GL_INVALID_VALUE, "glFog" );
return;
}
_mesa_error( ctx, GL_INVALID_VALUE, "glFog" );
return;
}
@@
-163,7
+161,7
@@
_mesa_Fogfv( GLenum pname, const GLfloat *params )
break;
case GL_FOG_COORDINATE_SOURCE_EXT: {
GLenum p = (GLenum) (GLint) *params;
break;
case GL_FOG_COORDINATE_SOURCE_EXT: {
GLenum p = (GLenum) (GLint) *params;
- if (ctx->API != API_OPENGL_COMPAT ||
!ctx->Extensions.EXT_fog_coord ||
+ if (ctx->API != API_OPENGL_COMPAT ||
(p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glFog");
return;
(p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glFog");
return;
@@
-192,7
+190,7
@@
_mesa_Fogfv( GLenum pname, const GLfloat *params )
}
if (ctx->Driver.Fogfv) {
}
if (ctx->Driver.Fogfv) {
-
(*ctx->Driver.Fogfv)
( ctx, pname, params );
+
ctx->Driver.Fogfv
( ctx, pname, params );
}
return;
}
return;