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/vbo | |
| 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/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index fd15fb6a9c3..7eda31e8f2b 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -189,7 +189,7 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx ) * vtxfmt mechanism can be removed now. */ vbo_exec_init( ctx ); - if (ctx->API == API_OPENGL) + if (ctx->API == API_OPENGL_COMPAT) vbo_save_init( ctx ); _math_init_eval(); @@ -221,7 +221,7 @@ void _vbo_DestroyContext( struct gl_context *ctx ) } vbo_exec_destroy(ctx); - if (ctx->API == API_OPENGL) + if (ctx->API == API_OPENGL_COMPAT) vbo_save_destroy(ctx); free(vbo); ctx->swtnl_im = NULL; diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 75e549fc419..2aaa2895ca6 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -465,10 +465,10 @@ vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) updateMats = ALL_MATERIAL_BITS; } - if (ctx->API == API_OPENGL && face == GL_FRONT) { + if (ctx->API == API_OPENGL_COMPAT && face == GL_FRONT) { updateMats &= FRONT_MATERIAL_BITS; } - else if (ctx->API == API_OPENGL && face == GL_BACK) { + else if (ctx->API == API_OPENGL_COMPAT && face == GL_BACK) { updateMats &= BACK_MATERIAL_BITS; } else if (face != GL_FRONT_AND_BACK) { @@ -514,7 +514,7 @@ vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) MAT_ATTR(VBO_ATTRIB_MAT_BACK_SHININESS, 1, params); break; case GL_COLOR_INDEXES: - if (ctx->API != API_OPENGL) { + if (ctx->API != API_OPENGL_COMPAT) { _mesa_error(ctx, GL_INVALID_ENUM, "glMaterialfv(pname)"); return; } |