ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Check if we can do the blit before messing with surface flags in IWineD3DSurfaceImpl_BltOverride(). 

As an added benefit blit_supported() will now get the rectangles in the
correct coordinate system.
This commit is contained in:
Henri Verbeet 2010-10-21 12:40:44 +02:00 committed by Alexandre Julliard
parent b0c8b4dd95
commit 574169174e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/surface.c
View File

@ -3642,6 +3642,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface,
return arbfp_blit_surface(device, src_surface, &src_rect, dst_surface, &dst_rect, BLIT_OP_BLIT, Filter); return arbfp_blit_surface(device, src_surface, &src_rect, dst_surface, &dst_rect, BLIT_OP_BLIT, Filter);
} }
if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT,
&src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
&dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
{
FIXME("Unsupported blit operation falling back to software\n");
return WINED3DERR_INVALIDCALL;
}
/* Color keying: Check if we have to do a color keyed blt, /* Color keying: Check if we have to do a color keyed blt,
* and if not check if a color key is activated. * and if not check if a color key is activated.
* *
@ -3675,14 +3683,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface,
dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom;
} }
if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT,
&src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
&dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
{
FIXME("Unsupported blit operation falling back to software\n");
return WINED3DERR_INVALIDCALL;
}
device->blitter->set_shader((IWineD3DDevice *)device, src_surface); device->blitter->set_shader((IWineD3DDevice *)device, src_surface);
ENTER_GL(); ENTER_GL();