Stefan Dösinger : wined3d: SetRenderTarget bypasses stateblock recording.
Alexandre Julliard
julliard at winehq.org
Fri Oct 2 11:02:23 CDT 2009
Module: wine
Branch: master
Commit: 4a3f04cb5633d073b8ecdbc298e09ff71ba70c35
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3f04cb5633d073b8ecdbc298e09ff71ba70c35
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Sep 30 18:58:04 2009 +0200
wined3d: SetRenderTarget bypasses stateblock recording.
---
dlls/wined3d/device.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6cbf115..e4b5cd1 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6130,7 +6130,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED
static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- WINED3DVIEWPORT viewport;
int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion;
TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget);
@@ -6165,14 +6164,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface,
/* Render target 0 is special */
if(RenderTargetIndex == 0 && dxVersion > 7) {
- /* Finally, reset the viewport as the MSDN states. */
- viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height;
- viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width;
- viewport.X = 0;
- viewport.Y = 0;
- viewport.MaxZ = 1.0f;
- viewport.MinZ = 0.0f;
- IWineD3DDeviceImpl_SetViewport(iface, &viewport);
+ /* Finally, reset the viewport as the MSDN states. Tests show that stateblock recording is ignored.
+ * the change goes directly into the primary stateblock.
+ */
+ This->stateBlock->viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height;
+ This->stateBlock->viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width;
+ This->stateBlock->viewport.X = 0;
+ This->stateBlock->viewport.Y = 0;
+ This->stateBlock->viewport.MaxZ = 1.0f;
+ This->stateBlock->viewport.MinZ = 0.0f;
+ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT);
}
return WINED3D_OK;
}
More information about the wine-cvs
mailing list