diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-17 17:14:02 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-29 15:09:37 -0700 |
| commit | 91107b4ccf7a47633fce98b9ccfba7f559098cb7 (patch) | |
| tree | 083698696151e064d13c77a8e810b649af0d7ae3 | |
| parent | 843b876ba3e01af73ea4ca55a529911448c10b2a (diff) | |
| download | external_mesa3d-91107b4ccf7a47633fce98b9ccfba7f559098cb7.zip external_mesa3d-91107b4ccf7a47633fce98b9ccfba7f559098cb7.tar.gz external_mesa3d-91107b4ccf7a47633fce98b9ccfba7f559098cb7.tar.bz2 | |
mesa: Require names from Gen in core context
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/mesa/main/bufferobj.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index f8938a5..728cc51 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -720,6 +720,10 @@ bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer) else { /* non-default buffer object */ newBufObj = _mesa_lookup_bufferobj(ctx, buffer); + if (newBufObj == NULL && ctx->API == API_OPENGL_CORE) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glBindBuffer(non-gen name)"); + return; + } handle_bind_buffer_gen(ctx, target, buffer, &newBufObj); } diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 638e418..513f3bb 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1216,6 +1216,11 @@ _mesa_BindTexture( GLenum target, GLuint texName ) } } else { + if (ctx->API == API_OPENGL_CORE) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glBindTexture"); + return; + } + /* if this is a new texture id, allocate a texture object now */ newTexObj = ctx->Driver.NewTextureObject(ctx, texName, target); if (!newTexObj) { |