Alexander Dorofeyev : wined3d: Remove obsolete code & ModifyLocation TODO.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78312704d9d4712f52e712ee6176e64bf7b020f6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78312704d9d4712f52e712ee61...

Author: Alexander Dorofeyev 
Date:   Wed Sep  3 23:59:58 2008 +0300

wined3d: Remove obsolete code & ModifyLocation TODO.

This fbo logic appears to have already been implemented in ModifyLocation.

---

dlls/wined3d/device.c  |    4 ----
 dlls/wined3d/surface.c |    5 -----
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 74688dd..b0181fa 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5152,10 +5152,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This,  IWineD3DSurfa
          * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it
          */
         IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE);
-        /* TODO: Move the fbo logic into ModifyLocation() */
-        if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) {
-            target->Flags |= SFLAG_INTEXTURE;
-        }
     }
     if (Flags & WINED3DCLEAR_ZBUFFER) {
         /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 99379dd..8b50cf3 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3437,7 +3437,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
         /* Now load the surface */
         IWineD3DSurface_PreLoad((IWineD3DSurface *) Src);

-
         /* Activate the destination context, set it up for blitting */
         ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT);

@@ -3545,10 +3544,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
          * is outdated now
          */
         IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INDRAWABLE, TRUE);
-        /* TODO: This should be moved to ModifyLocation() */
-        if(!(dstSwapchain || wined3d_settings.offscreen_rendering_mode != ORM_FBO)) {
-            This->Flags |= SFLAG_INTEXTURE;
-        }

return WINED3D_OK;
     } else {