From 53192e17e55aa9ed3e3721bf4fdcb2b01a595202 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 31 Aug 2012 15:18:29 +0200
Subject: randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman
 xserver git update 31 Aug 2012

---
 mesalib/src/mesa/main/texobj.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mesalib/src/mesa/main/texobj.c')

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 638e418da..513f3bb05 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/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) {
-- 
cgit v1.2.3