mesa: Branch 'master'
Ben Skeggs
darktama at kemper.freedesktop.org
Thu Jan 25 04:12:55 UTC 2007
src/mesa/drivers/dri/nouveau/nouveau_sync.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+)
New commits:
diff-tree d5db167c2cf9243c3153efb29582df72d819e7ac (from 86996dfe32fccd5777dd0e410b5dbe964fb206d1)
Author: Ben Skeggs <darktama at iinet.net.au>
Date: Thu Jan 25 15:12:49 2007 +1100
nouveau: unbreak NOUVEAU_RING_DEBUG
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_sync.c b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
index 0bf20e7..e7bc4fc 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, GLu
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
{
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_not
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
{
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");
More information about the mesa-commit
mailing list