Module: wine Branch: master Commit: a48bbc36119945c3f9476a1fab28364345893bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48bbc36119945c3f9476a1fab...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Tue Jan 2 21:40:59 2007 +0100
wined3d: Add a viewport state to the state table.
---
dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 1 + dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c31f66..52e9012 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3095,6 +3095,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
LEAVE_GL();
+ /* Todo: move the gl code too */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); return WINED3D_OK;
} diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f68546b..3eed45e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2919,5 +2919,6 @@ const struct StateEntry StateTable[] = { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, + { /* , STATE_VIEWPORT */ STATE_VDECL, vertexdeclaration },
}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15958f3..8088b70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -433,7 +433,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD sta #define STATE_VSHADER (STATE_VDECL + 1) #define STATE_IS_VSHADER(a) ((a) == STATE_VSHADER)
-#define STATE_HIGHEST (STATE_VSHADER) +#define STATE_VIEWPORT (STATE_VSHADER + 1) +#define STATE_IS_VIEWPORT(a) ((a) == STATE_VIEWPORT) + +#define STATE_HIGHEST (STATE_VIEWPORT)
struct StateEntry {