xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Jun 26 07:22:08 PDT 2008
configure.ac | 2 ++
src/radeon_accel.c | 6 +++---
src/radeon_exa_render.c | 8 ++++----
src/radeon_textured_videofuncs.c | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 32e1d1daf4f68ea37624afaa2bc1ea7742e1163b
Author: Brad Smith <brad at comstyle.com>
Date: Thu Jun 26 10:22:03 2008 -0400
RADEON: sys/endian.h needs sys/types.h on BSDs
See bug 16512
diff --git a/configure.ac b/configure.ac
index 9ac46f7..4bf7487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,7 @@ AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"], [HAVE_SYS_ENDIAN_H="n
if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping macros])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
#include <sys/endian.h>
], [
int a = 1, b;
@@ -270,6 +271,7 @@ b = __swap16(a);
AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
#include <sys/endian.h>
], [
int a = 1, b;
commit dca522355a9039eca6efaba3b36397b246800f94
Author: Brad Smith <brad at comstyle.com>
Date: Thu Jun 26 10:13:59 2008 -0400
RADEON: fix copy/paste error in accel code
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index d45e932..65ad33d 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
info->CurrentLayout.bitsPerPixel);
#ifdef XF86DRI
- if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) {
+ if (info->directRenderingEnabled && (IS_R300_3D || IS_R500_3D)) {
drmRadeonGetParam np;
int num_pipes;
@@ -419,11 +419,11 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
}
}
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"num pipes is %d\n", info->num_gb_pipes);
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
switch(info->num_gb_pipes) {
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 8a1849c..4736e4f 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1978,7 +1978,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE |
(4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
} else {
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
BEGIN_RING(4 * vtx_count + 4);
else
BEGIN_RING(4 * vtx_count + 2);
@@ -1991,7 +1991,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
}
#else /* ACCEL_CP */
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
BEGIN_ACCEL(2 + vtx_count * 4);
else
BEGIN_ACCEL(1 + vtx_count * 4);
@@ -2032,7 +2032,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
xFixedToFloat(srcTopRight.x) / info->texW[0], xFixedToFloat(srcTopRight.y) / info->texH[0]);
}
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
/* flushing is pipelined, free/finish is not */
OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D);
@@ -2114,7 +2114,7 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
ENTER_DRAW(0);
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
BEGIN_ACCEL(2);
OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
} else
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index f0dad03..277d9b2 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -643,7 +643,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
pBox++;
}
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
BEGIN_VIDEO(2);
OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
} else
More information about the xorg-commit
mailing list