diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
| commit | 3dc034dda1a451ed7dc48cfb10caba11e66b4132 (patch) | |
| tree | ac2f7522e5b3287afdb5dcd5af6d9c6bb9a3d079 /mesalib/src/mesa/main/context.c | |
| parent | 4e7e0bd9194a033f05179fb64126c56fc6f072b5 (diff) | |
| parent | 436f8246cd5a377596f6e42e6562da186ef8df48 (diff) | |
| download | vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.gz vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.bz2 vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 5e9e539b2..e5ed97f00 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -564,6 +564,7 @@ _mesa_init_constants(struct gl_context *ctx) ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY; ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS; ctx->Const.MaxTextureBufferSize = 65536; + ctx->Const.TextureBufferOffsetAlignment = 1; ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE; ctx->Const.SubPixelBits = SUB_PIXEL_BITS; ctx->Const.MinPointSize = MIN_POINT_SIZE; @@ -1663,11 +1664,6 @@ _mesa_record_error(struct gl_context *ctx, GLenum error) if (ctx->ErrorValue == GL_NO_ERROR) { ctx->ErrorValue = error; } - - /* Call device driver's error handler, if any. This is used on the Mac. */ - if (ctx->Driver.Error) { - ctx->Driver.Error(ctx); - } } |