Skip to content

W
wine-winehq
Commit 78312704 authored by Alexander Dorofeyev's avatar Alexander Dorofeyev Committed by Alexandre Julliard
Browse files
Options

wined3d: Remove obsolete code & ModifyLocation TODO.

This fbo logic appears to have already been implemented in ModifyLocation.
parent 1bcd6e45
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
dlls/wined3d/device.c
View file @ 78312704
......@@ -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 */
......
dlls/wined3d/surface.c
View file @ 78312704
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment