diff --git a/src/nv50_exa.c b/src/nv50_exa.c index 221160d..3c1710e 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -825,73 +825,6 @@ NV50EXACheckComposite(int op, return TRUE; } -Bool -NV50EXAPrepareComposite(int op, - PicturePtr pspict, PicturePtr pmpict, PicturePtr pdpict, - PixmapPtr pspix, PixmapPtr pmpix, PixmapPtr pdpix) -{ - NV50EXA_LOCALS(pdpix); - - if (!PUSH_SPACE(push, 256)) - NOUVEAU_FALLBACK("space\n"); - PUSH_RESET(push); - PUSH_REFN (push, pNv->scratch, NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR); - - BEGIN_NV04(push, SUBC_2D(NV50_GRAPH_SERIALIZE), 1); - PUSH_DATA (push, 0); - - if (!NV50EXARenderTarget(pdpix, pdpict)) - NOUVEAU_FALLBACK("render target invalid\n"); - - NV50EXABlend(pdpix, pdpict, op, pmpict && pmpict->componentAlpha && - PICT_FORMAT_RGB(pmpict->format)); - - if (!NV50EXAPicture(pNv, pspix, pspict, 0)) - NOUVEAU_FALLBACK("src picture invalid\n"); - - if (pmpict) { - if (!NV50EXAPicture(pNv, pmpix, pmpict, 1)) - NOUVEAU_FALLBACK("mask picture invalid\n"); - - BEGIN_NV04(push, NV50_3D(FP_START_ID), 1); - if (pdpict->format == PICT_a8) { - PUSH_DATA (push, PFP_C_A8); - } else { - if (pmpict->componentAlpha && - PICT_FORMAT_RGB(pmpict->format)) { - if (NV50EXABlendOp[op].src_alpha) - PUSH_DATA (push, PFP_CCASA); - else - PUSH_DATA (push, PFP_CCA); - } else { - PUSH_DATA (push, PFP_C); - } - } - } else { - BEGIN_NV04(push, NV50_3D(FP_START_ID), 1); - if (pdpict->format == PICT_a8) - PUSH_DATA (push, PFP_S_A8); - else - PUSH_DATA (push, PFP_S); - } - - BEGIN_NV04(push, NV50_3D(TIC_FLUSH), 1); - PUSH_DATA (push, 0); - - BEGIN_NV04(push, NV50_3D(BIND_TIC(2)), 1); - PUSH_DATA (push, 1); - BEGIN_NV04(push, NV50_3D(BIND_TIC(2)), 1); - PUSH_DATA (push, 0x203); - - nouveau_pushbuf_bufctx(push, pNv->bufctx); - if (nouveau_pushbuf_validate(push)) { - nouveau_pushbuf_bufctx(push, NULL); - NOUVEAU_FALLBACK("validate\n"); - } - - return TRUE; -} - void NV50EXAComposite(PixmapPtr pdpix, int sx, int sy, int mx, int my, int dx, int dy, int w, int h)