Mesa (master): nvc0: clear the flushed flag

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Sun Sep 1 19:00:05 UTC 2013


Module: Mesa
Branch: master
Commit: 528a48ee8da91d79614a877edf8583d063db6c36
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=528a48ee8da91d79614a877edf8583d063db6c36

Author: Christoph Bumiller <christoph.bumiller at speed.at>
Date:   Tue Jun 18 10:59:45 2013 +0200

nvc0: clear the flushed flag

---

 src/gallium/drivers/nvc0/nvc0_state_validate.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nvc0/nvc0_state_validate.c
index 1e14723..4b50b43 100644
--- a/src/gallium/drivers/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nvc0/nvc0_state_validate.c
@@ -566,11 +566,10 @@ nvc0_state_validate(struct nvc0_context *nvc0, uint32_t mask, unsigned words)
 
    nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_3d);
    ret = nouveau_pushbuf_validate(nvc0->base.pushbuf);
-   if (unlikely(ret))
-      return FALSE;
 
-   if (unlikely(nvc0->state.flushed))
+   if (unlikely(nvc0->state.flushed)) {
+      nvc0->state.flushed = FALSE;
       nvc0_bufctx_fence(nvc0, nvc0->bufctx_3d, TRUE);
-
-   return TRUE;
+   }
+   return !ret;
 }




More information about the mesa-commit mailing list