diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-11-12 16:40:37 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-11-17 12:26:38 -0500 |
| commit | ee87f7becc2138348ec0d948829db6e86cee86da (patch) | |
| tree | 2fcf5e75603ecaecd222de2022907c6c3c9c401a /src/i830_exa.c | |
| parent | 3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef (diff) | |
| parent | a5b1e62337d4e8840347bb186db48697f0690a19 (diff) | |
Merge commit 'origin/master' into dri2
Conflicts:
src/i830_dri.c
src/i830_driver.c
src/i830_memory.c
Diffstat (limited to 'src/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index 17ea86c8..47f0ddf2 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -37,26 +37,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i810_reg.h" #include <string.h> -#ifdef I830DEBUG -#define DEBUG_I830FALLBACK 1 -#endif - #define ALWAYS_SYNC 0 #define ALWAYS_FLUSH 0 -#ifdef DEBUG_I830FALLBACK -#define I830FALLBACK(s, arg...) \ -do { \ - DPRINTF(PFX, "EXA fallback: " s "\n", ##arg); \ - return FALSE; \ -} while(0) -#else -#define I830FALLBACK(s, arg...) \ -do { \ - return FALSE; \ -} while(0) -#endif - const int I830CopyROP[16] = { ROP_0, /* GXclear */ @@ -248,11 +231,11 @@ I830EXASolid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2) static void I830EXADoneSolid(PixmapPtr pPixmap) { -#if ALWAYS_SYNC || ALWAYS_FLUSH || 1 +#if ALWAYS_SYNC || ALWAYS_FLUSH ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -#if ALWAYS_FLUSH || 1 - intel_batch_flush(pScrn); +#if ALWAYS_FLUSH + intel_batch_flush(pScrn, FALSE); #endif #if ALWAYS_SYNC I830Sync(pScrn); @@ -353,7 +336,7 @@ I830EXADoneCopy(PixmapPtr pDstPixmap) ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; #if ALWAYS_FLUSH - intel_batch_flush(pScrn); + intel_batch_flush(pScrn, FALSE); #endif #if ALWAYS_SYNC I830Sync(pScrn); @@ -374,7 +357,7 @@ i830_done_composite(PixmapPtr pDst) ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; #if ALWAYS_FLUSH - intel_batch_flush(pScrn); + intel_batch_flush(pScrn, FALSE); #endif #if ALWAYS_SYNC I830Sync(pScrn); @@ -530,7 +513,7 @@ static Bool I830EXAPrepareAccess(PixmapPtr pPix, int index) return TRUE; } - intel_batch_flush(scrn); + intel_batch_flush(scrn, FALSE); if (i830->need_sync) { I830Sync(scrn); i830->need_sync = FALSE; @@ -771,7 +754,7 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access) ScrnInfoPtr scrn = xf86Screens[screen->myNum]; I830Ptr i830 = I830PTR(scrn); - intel_batch_flush(scrn); + intel_batch_flush(scrn, FALSE); if (i830->need_sync) { I830Sync(scrn); i830->need_sync = FALSE; |