[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    [PATCH 5/5] wined3d: Remove obsolete code & ModifyLocation TODO.
From:       Alexander Dorofeyev <alexd4 () inbox ! lv>
Date:       2008-08-31 14:05:55
Message-ID: 48BAA543.5090900 () inbox ! lv
[Download RAW message or body]

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(-)

["36849a1c22254d82022fa02308992d11a4f45940.diff" (text/x-patch)]

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e63aaf4..17ca944 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5148,10 +5148,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 89314a3..0aacb37 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3433,7 +3433,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);
 
@@ -3554,10 +3553,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 {





[prev in list] [next in list] [prev in thread] [next in thread]