diff options
| author | Brad Smith <brad@comstyle.com> | 2008-06-26 10:13:59 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2008-06-26 10:13:59 -0400 |
| commit | dca522355a9039eca6efaba3b36397b246800f94 (patch) | |
| tree | b1308f95931a512033a5ce299e68d6d87060579f | |
| parent | f4292e110105910d0c19bf2db28e2682b27af2c7 (diff) | |
RADEON: fix copy/paste error in accel code
| -rw-r--r-- | src/radeon_accel.c | 6 | ||||
| -rw-r--r-- | src/radeon_exa_render.c | 8 | ||||
| -rw-r--r-- | src/radeon_textured_videofuncs.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index d45e932b..65ad33df 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 8a1849c7..4736e4f9 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 f0dad03f..277d9b2d 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 |