diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-21 01:39:09 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-21 01:39:09 +0000 |
| commit | fa15f6c840bcab5a37e42bca4b80668024352c98 (patch) | |
| tree | f126b062ea8e9cfb4ef10daec083c7df895dab82 /src/mesa/drivers/dri/savage/savageioctl.h | |
| parent | 677d1d07c41050e7474f44c592641b14ffd73e8c (diff) | |
Small cleanup:
* Remove some unused (mostly empty) functions
* Added context parameter to WAIT_IDLE_EMPTY[_LOCKED] for consistency
* Added debug messages to WAIT_IDLE_EMPTY[_LOCKED]
* Don't flush empty command buffers
Diffstat (limited to 'src/mesa/drivers/dri/savage/savageioctl.h')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savageioctl.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/savage/savageioctl.h b/src/mesa/drivers/dri/savage/savageioctl.h index 8f50324c3f..c7ff0017fd 100644 --- a/src/mesa/drivers/dri/savage/savageioctl.h +++ b/src/mesa/drivers/dri/savage/savageioctl.h @@ -28,14 +28,8 @@ #include "savagecontext.h" -void savageGetGeneralDmaBufferLocked( savageContextPtr mmesa ); - void savageFlushVertices( savageContextPtr mmesa ); -void savageFlushGeneralLocked( savageContextPtr imesa ); -void savageWaitAgeLocked( savageContextPtr imesa, int age ); -void savageWaitAge( savageContextPtr imesa, int age ); - unsigned int savageEmitEventLocked( savageContextPtr imesa, unsigned int flags ); unsigned int savageEmitEvent( savageContextPtr imesa, unsigned int flags ); void savageWaitEvent( savageContextPtr imesa, unsigned int event); @@ -43,17 +37,22 @@ void savageWaitEvent( savageContextPtr imesa, unsigned int event); void savageFlushCmdBufLocked( savageContextPtr imesa, GLboolean discard ); void savageFlushCmdBuf( savageContextPtr imesa, GLboolean discard ); -void savageDmaFinish( savageContextPtr imesa ); - -void savageRegetLockQuiescent( savageContextPtr imesa ); - void savageDDInitIoctlFuncs( GLcontext *ctx ); void savageSwapBuffers( __DRIdrawablePrivate *dPriv ); -#define WAIT_IDLE_EMPTY do { \ +#define WAIT_IDLE_EMPTY(imesa) do { \ + if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG) \ + fprintf (stderr, "WAIT_IDLE_EMPTY in %s\n", __FUNCTION__); \ savageWaitEvent(imesa, \ - savageEmitEvent(imesa, SAVAGE_WAIT_3D|SAVAGE_WAIT_2D)); \ + savageEmitEvent(imesa, SAVAGE_WAIT_2D|SAVAGE_WAIT_3D)); \ +} while (0) + +#define WAIT_IDLE_EMPTY_LOCKED(imesa) do { \ + if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG) \ + fprintf (stderr, "WAIT_IDLE_EMPTY_LOCKED in %s\n", __FUNCTION__); \ + savageWaitEvent(imesa, savageEmitEventLocked( \ + imesa, SAVAGE_WAIT_2D|SAVAGE_WAIT_3D)); \ } while (0) #define FLUSH_BATCH(imesa) do { \ |