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/ffb | |
| 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/ffb')
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_state.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_xmesa.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c index 86f92c83db..53d56d2043 100644 --- a/src/mesa/drivers/dri/ffb/ffb_state.c +++ b/src/mesa/drivers/dri/ffb/ffb_state.c @@ -26,6 +26,7 @@ */ #include "mtypes.h" +#include "buffers.h" #include "colormac.h" #include "mm.h" #include "ffb_dd.h" @@ -444,6 +445,8 @@ void ffbCalcViewport(GLcontext *ctx) static void ffbDDViewport(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height) { + /* update size of Mesa/software ancillary buffers */ + _mesa_ResizeBuffersMESA(); ffbCalcViewport(ctx); } diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c index 43c1f34661..4e38d08237 100644 --- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c +++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c @@ -494,12 +494,6 @@ ffbMakeCurrent(__DRIcontextPrivate *driContextPriv, (GLframebuffer *) driDrawPriv->driverPrivate, (GLframebuffer *) driReadPriv->driverPrivate); - if (!fmesa->glCtx->Viewport.Width) - _mesa_set_viewport(fmesa->glCtx, - 0, 0, - driDrawPriv->w, - driDrawPriv->h); - first_time = 0; if (fmesa->wid == ~0) { first_time = 1; |