Henri Verbeet : Revert "wined3d: Prevent crash when blit_priv is NULL.".
Alexandre Julliard
julliard at winehq.org
Wed Mar 30 13:15:35 CDT 2011
Module: wine
Branch: master
Commit: c9ba0949c2ee0224696bc00575a7d42d33fc355f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ba0949c2ee0224696bc00575a7d42d33fc355f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Mar 29 19:21:46 2011 +0200
Revert "wined3d: Prevent crash when blit_priv is NULL.".
This reverts commit 37aadc9e377d7840a607dbabff10de375f9fdde8.
This patch was superseded by b2132202c77b0d56b68d2a0f4c0c1f6d637ab577.
---
dlls/wined3d/surface.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0f20c1f..f76cdde 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT
}
/* Special cases for RenderTargets */
- if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET)
- || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))))
+ if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET)
+ || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))
{
if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter)))
return WINED3D_OK;
More information about the wine-cvs
mailing list