diff options
| author | Felix Kuehling <[email protected]> | 2004-03-20 19:40:09 +0000 |
|---|---|---|
| committer | Felix Kuehling <[email protected]> | 2004-03-20 19:40:09 +0000 |
| commit | fd8a7dc26b48876de025ff9b93cc6dea5659496b (patch) | |
| tree | 709e19cde3fad854aa6e4cf2ee727329d2cba3a9 /src/mesa | |
| parent | ef8cb129f452555a11e0c347b5b4f16604124c3b (diff) | |
Fixed MAXFIFO_S4. Removed WAIT_IDLE_EMPTY from savage_BCI_swap which resulted
in another small speedup. Fixed a problem that was masked by that
WAIT_IDLE_EMPTY:
- flush command buffer and WAIT_IDLE_EMPTY before uploading textures
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savageioctl.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagetex.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/savage/savageioctl.c b/src/mesa/drivers/dri/savage/savageioctl.c index 5eff31be146..94db5ab3d2b 100644 --- a/src/mesa/drivers/dri/savage/savageioctl.c +++ b/src/mesa/drivers/dri/savage/savageioctl.c @@ -175,7 +175,6 @@ static void savage_BCI_swap(savageContextPtr imesa) if (nbox > SAVAGE_NR_SAREA_CLIPRECTS) nbox = SAVAGE_NR_SAREA_CLIPRECTS; savageDMAFlush (imesa); - WAIT_IDLE_EMPTY; if(imesa->IsFullScreen) { /* full screen*/ @@ -426,7 +425,7 @@ static void savageDDFinish( GLcontext *ctx ) #define ALT_STATUS_WORD0 (* (volatile GLuint *)(imesa->MMIO_BASE+0x48c60)) #define STATUS_WORD0 (* (volatile GLuint *)(imesa->MMIO_BASE+0x48c00)) -#define MAXFIFO_S4 0x1FF00 +#define MAXFIFO_S4 0x7F00 #define MAXFIFO_S3D 0x7F00 static GLboolean savagePagePending_s4( savageContextPtr imesa ) { diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c index 488d838f9d9..15a33dac7ad 100644 --- a/src/mesa/drivers/dri/savage/savagetex.c +++ b/src/mesa/drivers/dri/savage/savagetex.c @@ -791,6 +791,8 @@ int savageUploadTexImages( savageContextPtr imesa, savageTextureObjectPtr t ) savageUpdateTexLRU( imesa, t ); if (t->dirty_images) { + FLUSH_BATCH( imesa ); + WAIT_IDLE_EMPTY; if (SAVAGE_DEBUG & DEBUG_VERBOSE_LRU) fprintf(stderr, "*"); |