diff options
author | Brian <brian@nostromo.localnet.net> | 2007-01-26 18:55:12 -0700 |
---|---|---|
committer | Brian <brian@nostromo.localnet.net> | 2007-01-26 18:55:12 -0700 |
commit | 1d74e565dbfc1a69c49fe67eed9c91f10d0ad2fc (patch) | |
tree | eecbf78b41dfdea04cac65ce1fa61aad23822148 /src/mesa/main/context.c | |
parent | 7e85b0a025a82c3ffed060a757a3b4adae03d269 (diff) | |
parent | 5a3d9853958993174f13c8cff6bcf11993a48f65 (diff) |
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r-- | src/mesa/main/context.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 7ff45cffe8..99f4dc9dfd 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -292,13 +292,8 @@ _mesa_forceCurrent(__GLcontext *gc) GLboolean _mesa_notifyResize(__GLcontext *gc) { - GLint x, y; - GLuint width, height; - __GLdrawablePrivate *d = gc->imports.getDrawablePrivate(gc); - if (!d || !d->getDrawableSize) - return GL_FALSE; - d->getDrawableSize( d, &x, &y, &width, &height ); /* update viewport, resize software buffers, etc. */ + (void) gc; return GL_TRUE; } @@ -1083,14 +1078,8 @@ _mesa_init_constants( GLcontext *ctx ) ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES; ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH; - /* If we're running in the X server, do bounds checking to prevent - * segfaults and server crashes! - */ -#if defined(XFree86Server) - ctx->Const.CheckArrayBounds = GL_TRUE; -#else + /* CheckArrayBounds is overriden by drivers/x11 for X server */ ctx->Const.CheckArrayBounds = GL_FALSE; -#endif /* GL_ARB_draw_buffers */ ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS; |