From d5db167c2cf9243c3153efb29582df72d819e7ac Mon Sep 17 00:00:00 2001
From: Ben Skeggs <darktama@iinet.net.au>
Date: Thu, 25 Jan 2007 15:12:49 +1100
Subject: nouveau: unbreak NOUVEAU_RING_DEBUG

---
 src/mesa/drivers/dri/nouveau/nouveau_sync.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/mesa/drivers/dri')

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_sync.c b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
index 0bf20e723b..e7bc4fcd5e 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_sync.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
@@ -14,6 +14,10 @@ nouveau_notifier_new(GLcontext *ctx, GLuint handle)
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 	nouveau_notifier *notifier;
 
+#ifdef NOUVEAU_RING_DEBUG
+	return NULL;
+#endif
+
 	notifier = CALLOC_STRUCT(nouveau_notifier_t);
 	if (!notifier)
 		return NULL;
@@ -53,6 +57,10 @@ nouveau_notifier_reset(nouveau_notifier *notifier)
 {
 	volatile GLuint *n = notifier->mem->map;
 
+#ifdef NOUVEAU_RING_DEBUG
+	return;
+#endif
+
 	n[NV_NOTIFY_TIME_0      /4] = 0x00000000;
 	n[NV_NOTIFY_TIME_1      /4] = 0x00000000;
 	n[NV_NOTIFY_RETURN_VALUE/4] = 0x00000000;
@@ -67,6 +75,10 @@ nouveau_notifier_wait_status(nouveau_notifier *notifier, GLuint status,
 	volatile GLuint *n = notifier->mem->map;
 	unsigned int time = 0;
 
+#ifdef NOUVEAU_RING_DEBUG
+	return GL_TRUE;
+#endif
+
 	while (time <= timeout) {
 		if (n[NV_NOTIFY_STATE/4] & NV_NOTIFY_STATE_ERROR_CODE_MASK) {
 			MESSAGE("Notifier returned error: 0x%04x\n",
@@ -114,6 +126,10 @@ GLboolean nouveauSyncInitFuncs(GLcontext *ctx)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 
+#ifdef NOUVEAU_RING_DEBUG
+	return GL_TRUE;
+#endif
+
 	nmesa->syncNotifier = nouveau_notifier_new(ctx, NvSyncNotify);
 	if (!nmesa->syncNotifier) {
 		MESSAGE("Failed to create channel sync notifier\n");
-- 
cgit v1.2.3