summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texobj.c
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2012-08-17 17:14:02 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-08-29 15:09:37 -0700
commit91107b4ccf7a47633fce98b9ccfba7f559098cb7 (patch)
tree083698696151e064d13c77a8e810b649af0d7ae3 /src/mesa/main/texobj.c
parent843b876ba3e01af73ea4ca55a529911448c10b2a (diff)
mesa: Require names from Gen in core context
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/texobj.c')
-rw-r--r--src/mesa/main/texobj.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 638e418dab4..513f3bb0567 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) {