diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-27 22:47:59 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-27 22:47:59 +0000 |
| commit | 65a66f5bc37383c00423c21baf8ba9d6771e0259 (patch) | |
| tree | 0d98e004b457adde579dd27b9fe32182d54268b6 /src/mesa/drivers/dri/gamma | |
| parent | 118a8bad73bda88fc54f802b2beeb687c8ddb45a (diff) | |
Remove _mesa_ResizeBuffersMESA() call from _mesa_set_viewport().
Now, the driver's Viewport routine should call _mesa_ResizeBuffersMESA()
if necessary.
Cleaned up code related to GLframebuffer width/height initialization.
Set initial viewport/scissor params in _mesa_make_current2(), instead of
in the drivers' MakeCurrent functions.
Diffstat (limited to 'src/mesa/drivers/dri/gamma')
| -rw-r--r-- | src/mesa/drivers/dri/gamma/gamma_state.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/gamma/gamma_xmesa.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c index 7beabc6926..29f1a57959 100644 --- a/src/mesa/drivers/dri/gamma/gamma_state.c +++ b/src/mesa/drivers/dri/gamma/gamma_state.c @@ -27,6 +27,7 @@ #include "gamma_context.h" #include "gamma_macros.h" +#include "buffers.h" #include "macros.h" #include "glint_dri.h" #include "colormac.h" @@ -1098,6 +1099,8 @@ void gammaUpdateWindow( GLcontext *ctx ) static void gammaDDViewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height ) { + /* update size of Mesa/software ancillary buffers */ + _mesa_ResizeBuffersMESA(); gammaUpdateWindow( ctx ); } diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c index 64ba0d909a..00f6aa32ae 100644 --- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c +++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c @@ -225,11 +225,6 @@ newGammaCtx->new_state |= GAMMA_NEW_WINDOW; /* FIXME */ _mesa_make_current2( newGammaCtx->glCtx, (GLframebuffer *) driDrawPriv->driverPrivate, (GLframebuffer *) driReadPriv->driverPrivate ); - - if (!newGammaCtx->glCtx->Viewport.Width) { - _mesa_set_viewport(newGammaCtx->glCtx, 0, 0, - driDrawPriv->w, driDrawPriv->h); - } } else { _mesa_make_current( 0, 0 ); } |