Mesa (master): intel: Fix up INTEL_NO_HW support.

Eric Anholt anholt at kemper.freedesktop.org
Fri Feb 26 02:43:44 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Feb 25 14:27:07 2010 -0800

intel: Fix up INTEL_NO_HW support.

This was accidentally (it seems) deleted in
5203b7227ccb6b618fa42f08434d4a3cf123dca2

---

 src/mesa/drivers/dri/intel/intel_batchbuffer.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
index 4c99dcd..e38f10e 100644
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
@@ -104,7 +104,8 @@ do_flush_locked(struct intel_batchbuffer *batch, GLuint used)
    batch->map = NULL;
    batch->ptr = NULL;
 
-   dri_bo_exec(batch->buf, used, NULL, 0, (x_off & 0xffff) | (y_off << 16));
+   if (!intel->no_hw)
+      dri_bo_exec(batch->buf, used, NULL, 0, (x_off & 0xffff) | (y_off << 16));
 
    if (INTEL_DEBUG & DEBUG_BATCH) {
       dri_bo_map(batch->buf, GL_FALSE);




More information about the mesa-commit mailing list