diff options
| author | Ian Romanick <[email protected]> | 2012-08-17 17:14:47 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-29 15:09:37 -0700 |
| commit | 04d6ffa06deff792aea49eccc4bceb1a91a1892e (patch) | |
| tree | 49d4160a63512d31e2ee0c04fb57b4bcc4ad7ebe | |
| parent | 91107b4ccf7a47633fce98b9ccfba7f559098cb7 (diff) | |
mesa: Disallow more deprecated functions in core context
Signed-off-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/vtxfmt.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index af73074d29f..167a9428634 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -582,7 +582,7 @@ _mesa_create_exec_table(struct gl_context *ctx) /* ARB 1. GL_ARB_multitexture */ #if _HAVE_FULL_GL SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB); - if (ctx->API != API_OPENGLES2) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB); } #endif diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index d8cd2dd7152..2b6e25ecdf6 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -48,9 +48,8 @@ static void install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, const GLvertexformat *vfmt) { - _mesa_install_arrayelt_vtxfmt(tab, vfmt); - if (ctx->API != API_OPENGL_CORE) { + _mesa_install_arrayelt_vtxfmt(tab, vfmt); SET_Color3f(tab, vfmt->Color3f); SET_Color3fv(tab, vfmt->Color3fv); SET_Color4f(tab, vfmt->Color4f); |