Henri Verbeet : wined3d: Get rid of some redundant checks for ORM_FBO.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ba16b84a9e60ffcc98fc4b4c303c975589b59e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ba16b84a9e60ffcc98fc4b4c3...

Author: Henri Verbeet 
Date:   Thu Sep 17 12:35:26 2009 +0200

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.

---

dlls/wined3d/surface.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c3aff86..86e6da1 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -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
          * backends.
          */
-        if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT)
-                && surface_can_stretch_rect(Src, This))
+        if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This))
         {
             stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect,
                     (IWineD3DSurface *)This, &rect, Filter, upsideDown);
@@ -3647,9 +3646,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const
             Src->palette = This->palette;
         }

-        if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT)
-                && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE))
-                && surface_can_stretch_rect(Src, This))
+        if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This)
+                && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)))
         {
             TRACE("Using stretch_rect_fbo\n");
             /* The source is always a texture, but never the currently active render target, and the texture