diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-05 23:45:42 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-05 23:45:42 +0000 |
| commit | ae1bc4a6da92ab31c933baa0b3f6c17c9bd16eb5 (patch) | |
| tree | 484db3e0ebf3a170267fc636a4be3414030ba1f9 /shared-core/savage_bci.c | |
| parent | 4818014ab10e5ab27fe7c87f7936a932526612a6 (diff) | |
3D scissor regs are now managed by the DRM to iterate over clip rects
passed to the cmdbuf ioctl (try xeyes on top of glxgears ;-)
Tightened the texture state check
Bumped Savage DRM version to 2.1.0 so that DRI driver can (theoretically)
depend on the DRM to manage the scissor registers
Diffstat (limited to 'shared-core/savage_bci.c')
| -rw-r--r-- | shared-core/savage_bci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/shared-core/savage_bci.c b/shared-core/savage_bci.c index 55129ab1..e5f00391 100644 --- a/shared-core/savage_bci.c +++ b/shared-core/savage_bci.c @@ -42,7 +42,8 @@ savage_bci_wait_fifo_shadow(drm_savage_private_t *dev_priv, unsigned int n) #if SAVAGE_BCI_DEBUG if (n > dev_priv->cob_size + SAVAGE_BCI_FIFO_SIZE - threshold) - DRM_ERROR("Trying to emit more than guaranteed space in COB"); + DRM_ERROR("Trying to emit %d words " + "(more than guaranteed space in COB)\n", n); #endif for (i = 0; i < SAVAGE_DEFAULT_USEC_TIMEOUT; i++) { @@ -484,6 +485,12 @@ static int savage_do_init_bci(drm_device_t *dev, drm_savage_init_t *init) dev_priv->wait_evnt = savage_bci_wait_event_reg; } + /* cliprect functions */ + if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) + dev_priv->emit_clip_rect = savage_emit_clip_rect_s3d; + else + dev_priv->emit_clip_rect = savage_emit_clip_rect_s4; + if (savage_freelist_init(dev) < 0) { DRM_ERROR("could not initialize freelist\n"); savage_do_cleanup_bci(dev); |