Skip to content

W
wine-winehq
Commit c9ba0949 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

Revert "wined3d: Prevent crash when blit_priv is NULL.".

This reverts commit 37aadc9e. This patch was superseded by b2132202.
parent 0adc1b60
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/wined3d/surface.c
View file @ c9ba0949
...@@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT ...@@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT
} }
/* Special cases for RenderTargets */ /* Special cases for RenderTargets */
if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET)
|| (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))
{ {
if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter)))
return WINED3D_OK; return WINED3D_OK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment