diff options
Diffstat (limited to 'src/nv40_xv_tex.c')
| -rw-r--r-- | src/nv40_xv_tex.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c index 78dd0d6..2184678 100644 --- a/src/nv40_xv_tex.c +++ b/src/nv40_xv_tex.c @@ -36,8 +36,6 @@ #include "nv_include.h" #include "nv_dma.h" -#include "nv30_shaders.h" - #include "hwdefs/nv30-40_3d.xml.h" #include "nv04_accel.h" @@ -236,17 +234,18 @@ NV40PutTextureImage(ScrnInfoPtr pScrn, return BadImplementation; } - NV40_LoadVtxProg(pScrn, &nv40_vp_video); - if (drw_w / 2 < src_w || drw_h / 2 < src_h) bicubic = FALSE; - if (!NV40_LoadFragProg(pScrn, bicubic ? - &nv40_fp_yv12_bicubic : - &nv30_fp_yv12_bilinear)) { - PUSH_RESET(push); - return BadImplementation; - } + BEGIN_NV04(push, NV30_3D(FP_ACTIVE_PROGRAM), 1); + PUSH_MTHD (push, NV30_3D(FP_ACTIVE_PROGRAM), pNv->scratch, + bicubic ? PFP_NV12_BICUBIC : PFP_NV12_BILINEAR, + NOUVEAU_BO_VRAM | NOUVEAU_BO_RD | NOUVEAU_BO_LOW | + NOUVEAU_BO_OR, + NV30_3D_FP_ACTIVE_PROGRAM_DMA0, + NV30_3D_FP_ACTIVE_PROGRAM_DMA1); + BEGIN_NV04(push, NV30_3D(FP_CONTROL), 1); + PUSH_DATA (push, 0x04000000); /* Appears to be some kind of cache flush, needed here at least * sometimes.. funky text rendering otherwise :) |