Module Name: xsrc
Committed By: macallan
Date: Fri Sep 16 22:05:47 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c
Log Message:
- DPRINTF() some debug output
- remove unused #defines
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.8 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.9
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.8 Fri Sep 16 21:16:37 2016
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Fri Sep 16 22:05:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_accel.c,v 1.8 2016/09/16 21:16:37 macallan Exp $ */
+/* $NetBSD: cg14_accel.c,v 1.9 2016/09/16 22:05:47 macallan Exp $ */
/*
* Copyright (c) 2013 Michael Lorenz
* All rights reserved.
@@ -43,9 +43,7 @@
#include "cg14.h"
#include <sparc/sxreg.h>
-#define SX_SINGLE
/*#define SX_DEBUG*/
-/*#define SX_ADD_SOFTWARE*/
#ifdef SX_DEBUG
#define ENTER xf86Msg(X_ERROR, "%s>\n", __func__);
@@ -548,7 +546,7 @@ CG14CheckComposite(int op, PicturePtr pS
*/
if ((op != PictOpOver) && (op != PictOpAdd) && (op != PictOpSrc)) {
- xf86Msg(X_ERROR, "%s: rejecting %d\n", __func__, op);
+ DPRINTF(X_ERROR, "%s: rejecting %d\n", __func__, op);
return FALSE;
}
i = 0;
@@ -558,7 +556,7 @@ CG14CheckComposite(int op, PicturePtr pS
}
if (!ok) {
- xf86Msg(X_ERROR, "%s: unsupported src format %x\n",
+ DPRINTF(X_ERROR, "%s: unsupported src format %x\n",
__func__, pSrcPicture->format);
return FALSE;
}
@@ -852,9 +850,9 @@ CG14InitAccel(ScreenPtr pScreen)
pExa->pixmapOffsetAlign = 8;
pExa->pixmapPitchAlign = 8;
- pExa->flags = EXA_OFFSCREEN_PIXMAPS |
- /*EXA_SUPPORTS_OFFSCREEN_OVERLAPS |*/
- EXA_MIXED_PIXMAPS;
+ pExa->flags = EXA_OFFSCREEN_PIXMAPS
+ /* | EXA_SUPPORTS_OFFSCREEN_OVERLAPS |*/
+ | EXA_MIXED_PIXMAPS;
/*
* these limits are bogus
