Commit 2d4d18b5 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

wined3d: Delay render target activation.

The ActivateContext in SetRenderTarget was an old regression prevention, but now it is time to remove it.
parent 1c7f39ed
...@@ -6724,13 +6724,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, ...@@ -6724,13 +6724,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface,
* SetViewport may catch NOP viewport changes, which would occur when switching between equally sized targets * SetViewport may catch NOP viewport changes, which would occur when switching between equally sized targets
*/ */
IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT);
/* Activate the new render target for now. This shouldn't stay here, but is needed until all methods using gl activate the
* ctx properly.
* Use resourceload usage, this will just set the drawables and context but not apply any states. The stateblock may be
* incomplete or incorrect when SetRenderTarget is called. DrawPrim() will apply the states when it is called.
*/
ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD);
} }
return WINED3D_OK; return WINED3D_OK;
} }
......
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