From ae1bc4a6da92ab31c933baa0b3f6c17c9bd16eb5 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Wed, 5 Jan 2005 23:45:42 +0000 Subject: 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 --- shared-core/savage_bci.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'shared-core/savage_bci.c') 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); -- cgit v1.2.3