diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-07 02:57:04 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-07 02:57:04 +0000 |
| commit | d75963d2581f139de9a7fcbe95e3fb6a38231fe8 (patch) | |
| tree | 100e455baa05984079e68b30da4f80df0ead789f | |
| parent | 8ee311d36dd48ffdd23a48e1be3329fe54e809b2 (diff) | |
disable double-buffer test in check_compatible(), fixes pbuffer/visual problem
| -rw-r--r-- | src/mesa/main/context.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 725386a3c2..05b8c57d11 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1508,8 +1508,11 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer) if (ctxvis->rgbMode != bufvis->rgbMode) return GL_FALSE; +#if 0 + /* disabling this fixes the fgl_glxgears pbuffer demo */ if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode) return GL_FALSE; +#endif if (ctxvis->stereoMode && !bufvis->stereoMode) return GL_FALSE; if (ctxvis->haveAccumBuffer && !bufvis->haveAccumBuffer) @@ -1575,12 +1578,18 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, /* Check that the context's and framebuffer's visuals are compatible. */ if (newCtx && drawBuffer && newCtx->DrawBuffer != drawBuffer) { - if (!check_compatible(newCtx, drawBuffer)) + if (!check_compatible(newCtx, drawBuffer)) { + _mesa_warning(newCtx, + "MakeCurrent: incompatible visuals for context and drawbuffer"); return; + } } if (newCtx && readBuffer && newCtx->ReadBuffer != readBuffer) { - if (!check_compatible(newCtx, readBuffer)) + if (!check_compatible(newCtx, readBuffer)) { + _mesa_warning(newCtx, + "MakeCurrent: incompatible visuals for context and readbuffer"); return; + } } #if !defined(IN_DRI_DRIVER) |