Henri Verbeet : wined3d: Get rid of the broken render target check for surface_blt_special().
Alexandre Julliard
julliard at winehq.org
Tue Sep 24 15:16:48 CDT 2013
Module: wine
Branch: master
Commit: ea4c3d5d5d3df37391a349542ce82b5a4f56d470
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4c3d5d5d3df37391a349542ce82b5a4f56d470
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Sep 24 09:48:45 2013 +0200
wined3d: Get rid of the broken render target check for surface_blt_special().
This used to work out in practice because swapchain surfaces were always
considered render targets, but that's no longer true. We can just remove the
check, because surface_blt_special() already contains a proper check itself
anyway.
---
dlls/wined3d/surface.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c61f589..9d7accd 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6777,15 +6777,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
}
fallback:
-
/* Special cases for render targets. */
- if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET)
- || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET)))
- {
- if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect,
- src_surface, &src_rect, flags, fx, filter)))
- return WINED3D_OK;
- }
+ if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter)))
+ return WINED3D_OK;
cpu:
More information about the wine-cvs
mailing list