Rebase against 887b445bb87861f2c11e6c5248d105c1fc52f125.

This commit is contained in:
Sebastian Lackner
2016-03-08 16:25:57 +01:00
parent 87f68ad2f4
commit 66ba61188b
3 changed files with 170 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
From e4f44b72b638d9404ad264565687a5d5c4b60b9b Mon Sep 17 00:00:00 2001
From 9627792f549907cfa050d89f464f7a19a1ef1c59 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sun, 25 Oct 2015 12:50:31 +0100
Subject: wined3d: Print FIXME only once in surface_cpu_blt.
@@ -8,11 +8,11 @@ Subject: wined3d: Print FIXME only once in surface_cpu_blt.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index a8f7179..ca4fe5d 100644
index 814d4ab..8192c18 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4660,7 +4660,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
&& (srcwidth != dstwidth || srcheight != dstheight))
@@ -4238,7 +4238,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
&& (src_width != dst_width || src_height != dst_height))
{
/* 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));
@@ -20,7 +20,7 @@ index a8f7179..ca4fe5d 100644
+ if (!once++) FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(filter));
}
xinc = (srcwidth << 16) / dstwidth;
xinc = (src_width << 16) / dst_width;
--
2.6.2
2.7.1