Henri Verbeet : wined3d: Only complain about unsupported filtering if we have a reason to.
Alexandre Julliard
julliard at winehq.org
Fri Oct 29 10:58:20 CDT 2010
Module: wine
Branch: master
Commit: 1e301027dcbeef3f4885ee06d388f9a9318f042a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e301027dcbeef3f4885ee06d388f9a9318f042a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Oct 29 12:25:17 2010 +0200
wined3d: Only complain about unsupported filtering if we have a reason to.
---
dlls/wined3d/surface_base.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index 1324acf..b9dd634 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -947,11 +947,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D
return WINEDDERR_SURFACEBUSY;
}
- if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) {
- /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */
- FIXME("Filters not supported in software blit\n");
- }
-
/* First check for the validity of source / destination rectangles.
* This was verified using a test application + by MSDN. */
@@ -1218,6 +1213,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D
if (!dstwidth || !dstheight) /* hmm... stupid program ? */
goto release;
+
+ if (Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT
+ && (srcwidth != dstwidth || srcheight != dstheight))
+ {
+ /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */
+ FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(Filter));
+ }
+
sbase = (BYTE*)slock.pBits+(xsrc.top*slock.Pitch)+xsrc.left*bpp;
xinc = (srcwidth << 16) / dstwidth;
yinc = (srcheight << 16) / dstheight;
More information about the wine-cvs
mailing list