rpms/xorg-x11-drv-nouveau/devel nouveau-bicubic-2x.patch,NONE,1.1

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28734

Added Files:
	nouveau-bicubic-2x.patch 
Log Message:
forgotten patch


nouveau-bicubic-2x.patch:

--- NEW FILE nouveau-bicubic-2x.patch ---
>From 4b61a6276ea839ba3419367d2d9a96fd1deb3c73 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at beleth.localdomain>
Date: Mon, 4 May 2009 17:04:34 +1000
Subject: [PATCH 5/5] xv: only use bicubic filtering when scaling >=2x

---
 src/nv30_xv_tex.c |    2 +-
 src/nv40_xv_tex.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
index 96796fa..adb9010 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
@@ -324,7 +324,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
 	BEGIN_RING(chan, rankine, NV34TCL_TX_ENABLE(3), 1);
 	OUT_RING  (chan, 0x0);
 
-	if (pPriv->bicubic)
+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bicubic);
 	else
 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
index 46a7c3d..417dfb7 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
@@ -300,7 +300,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
 	NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2);
 
 	NV40_LoadVtxProg(pScrn, &nv40_vp_video);
-	if (pPriv->bicubic)
+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
 		NV40_LoadFragProg(pScrn, &nv40_fp_yv12_bicubic);
 	else
 		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
-- 
1.6.2.5