diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-31 15:18:29 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:28 +0200 |
| commit | d7fc06ac528d54e0e1416cb8aa89b6fd072400a5 (patch) | |
| tree | 74cccede044412bba5723a132f1385aa9259f04b /mesalib/src/mesa/main/texobj.c | |
| parent | 9dec848b23cf905ded387820f2893425cc00d545 (diff) | |
| download | vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.gz vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.bz2 vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.zip | |
randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver
git update 31 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/main/texobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |