diff options
| author | Paul Berry <[email protected]> | 2012-11-27 12:26:51 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-11-29 11:33:15 -0800 |
| commit | dbd6135bc1ba285128ab991c03c4df6fbd6fefe8 (patch) | |
| tree | 781c0057d2a7fa6dca36b39343dee3884ea650bb /src/mesa/main/light.c | |
| parent | 3e163a137be7f9a80ec720903c4bda028de5681f (diff) | |
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 <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/light.c')
| -rw-r--r-- | src/mesa/main/light.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index b0a10e9edd8..aae5d0ae947 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -466,7 +466,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params ) COPY_4V( ctx->Light.Model.Ambient, params ); break; case GL_LIGHT_MODEL_LOCAL_VIEWER: - if (ctx->API != API_OPENGL) + if (ctx->API != API_OPENGL_COMPAT) goto invalid_pname; newbool = (params[0]!=0.0); if (ctx->Light.Model.LocalViewer == newbool) @@ -486,7 +486,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params ) ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE; break; case GL_LIGHT_MODEL_COLOR_CONTROL: - if (ctx->API != API_OPENGL) + if (ctx->API != API_OPENGL_COMPAT) goto invalid_pname; if (params[0] == (GLfloat) GL_SINGLE_COLOR) newenum = GL_SINGLE_COLOR; @@ -798,7 +798,7 @@ _mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params ) *params = mat[MAT_ATTRIB_SHININESS(f)][0]; break; case GL_COLOR_INDEXES: - if (ctx->API != API_OPENGL) { + if (ctx->API != API_OPENGL_COMPAT) { _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" ); return; } @@ -820,7 +820,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params ) GLfloat (*mat)[4] = ctx->Light.Material.Attrib; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */ - ASSERT(ctx->API == API_OPENGL); + ASSERT(ctx->API == API_OPENGL_COMPAT); FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */ |