diff options
| author | Alex Deucher <alex@samba.(none)> | 2008-03-18 11:15:17 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2008-03-18 11:15:17 -0400 |
| commit | c362591d9b496df30668543158e4de44de742dc3 (patch) | |
| tree | 1ea84b93080635f83688fbd09c7aa122e1704583 /src/radeon_exa_render.c | |
| parent | 89fe6d2c7d7471e6088558130f6e49f46c31dd47 (diff) | |
R3xx/R5xx: remove some cruft
Diffstat (limited to 'src/radeon_exa_render.c')
| -rw-r--r-- | src/radeon_exa_render.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index dd070846..9718359f 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -952,8 +952,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP PixmapPtr pSrcPixmap, pDstPixmap; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; RADEONInfoPtr info = RADEONPTR(pScrn); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - int i; int max_tex_w, max_tex_h, max_dst_w, max_dst_h; Bool is_r500; @@ -963,33 +961,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); -#if 0 - /* Throw out cases that aren't going to be our rotation first */ - if (pMaskPicture != NULL || op != PictOpSrc || pSrcPicture->pDrawable == NULL) - RADEON_FALLBACK(("Junk driver\n")); - - if (pSrcPicture->pDrawable->type != DRAWABLE_WINDOW || - pDstPicture->pDrawable->type != DRAWABLE_PIXMAP) { - RADEON_FALLBACK(("bad drawable\n")); - } - - pSrcPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) pSrcPicture->pDrawable); - pDstPixmap = (PixmapPtr)pDstPicture->pDrawable; - - /* Check if the dest is one of our shadow pixmaps */ - for (i = 0; i < xf86_config->num_crtc; i++) { - xf86CrtcPtr crtc = xf86_config->crtc[i]; - - if (crtc->rotatedPixmap == pDstPixmap) - break; - } - if (i == xf86_config->num_crtc) - RADEON_FALLBACK(("no rotated pixmap\n")); - - if (pSrcPixmap != pScreen->GetScreenPixmap(pScreen)) - RADEON_FALLBACK(("src not screen\n")); -#endif - pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); is_r500 = ((info->ChipFamily >= CHIP_FAMILY_RV515) && |