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

wined3d: Get rid of some redundant checks for ORM_FBO. 

ORM_FBO is already implied by surface_can_stretch_rect() because
WINED3DFMT_FLAG_FBO_ATTACHABLE can only be set when ORM_FBO is.
This commit is contained in:
Henri Verbeet 2009-09-17 12:35:26 +02:00 committed by Alexandre Julliard
parent de3bd86fb6
commit 4ba16b84a9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/surface.c
View File

@ -3583,8 +3583,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const
* FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering
* backends. * backends.
*/ */
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This))
&& surface_can_stretch_rect(Src, This))
{ {
stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect,
(IWineD3DSurface *)This, &rect, Filter, upsideDown); (IWineD3DSurface *)This, &rect, Filter, upsideDown);
@ -3647,9 +3646,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const
Src->palette = This->palette; Src->palette = This->palette;
} }
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This)
&& !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)))
&& surface_can_stretch_rect(Src, This))
{ {
TRACE("Using stretch_rect_fbo\n"); TRACE("Using stretch_rect_fbo\n");
/* The source is always a texture, but never the currently active render target, and the texture /* The source is always a texture, but never the currently active render target, and the texture