diff options
| author | Paul Berry <stereotype441@gmail.com> | 2012-11-27 12:26:51 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2012-11-29 11:33:15 -0800 |
| commit | dbd6135bc1ba285128ab991c03c4df6fbd6fefe8 (patch) | |
| tree | 781c0057d2a7fa6dca36b39343dee3884ea650bb /src/mesa/main/fog.c | |
| parent | 3e163a137be7f9a80ec720903c4bda028de5681f (diff) | |
| download | external_mesa3d-dbd6135bc1ba285128ab991c03c4df6fbd6fefe8.zip external_mesa3d-dbd6135bc1ba285128ab991c03c4df6fbd6fefe8.tar.gz external_mesa3d-dbd6135bc1ba285128ab991c03c4df6fbd6fefe8.tar.bz2 | |
mesa: Rename API_OPENGL to API_OPENGL_COMPAT.
This should help avoid confusion now that we're using the gl_api enum
to distinguishing between core and compatibility API's. The
corresponding enum value for core API's is API_OPENGL_CORE.
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/fog.c')
| -rw-r--r-- | src/mesa/main/fog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index 07405fb..b37e95f 100644 --- a/src/mesa/main/fog.c +++ b/src/mesa/main/fog.c @@ -141,7 +141,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params ) update_fog_scale(ctx); break; case GL_FOG_INDEX: - if (ctx->API != API_OPENGL) + if (ctx->API != API_OPENGL_COMPAT) goto invalid_pname; if (ctx->Fog.Index == *params) return; @@ -163,7 +163,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params ) break; case GL_FOG_COORDINATE_SOURCE_EXT: { GLenum p = (GLenum) (GLint) *params; - if (ctx->API != API_OPENGL || !ctx->Extensions.EXT_fog_coord || + if (ctx->API != API_OPENGL_COMPAT || !ctx->Extensions.EXT_fog_coord || (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) { _mesa_error(ctx, GL_INVALID_ENUM, "glFog"); return; @@ -176,7 +176,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params ) } case GL_FOG_DISTANCE_MODE_NV: { GLenum p = (GLenum) (GLint) *params; - if (ctx->API != API_OPENGL || !ctx->Extensions.NV_fog_distance || + if (ctx->API != API_OPENGL_COMPAT || !ctx->Extensions.NV_fog_distance || (p != GL_EYE_RADIAL_NV && p != GL_EYE_PLANE && p != GL_EYE_PLANE_ABSOLUTE_NV)) { _mesa_error(ctx, GL_INVALID_ENUM, "glFog"); return; |