From 78312704d9d4712f52e712ee6176e64bf7b020f6 Mon Sep 17 00:00:00 2001 From: Alexander Dorofeyev Date: Wed, 3 Sep 2008 23:59:58 +0300 Subject: [PATCH] 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, 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74688dd421f..b0181fa3b86 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 99379ddf939..8b50cf3b3ff 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 { -- 2.11.4.GIT