Stefan Dösinger : wined3d: Move WINED3DRS_PATCHEDGESTYLE to the state table.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 11 10:34:57 CST 2006
Module: wine
Branch: master
Commit: e498a16124812c88acde06bc209b821c777e3f37
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e498a16124812c88acde06bc209b821c777e3f37
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sun Dec 10 23:21:10 2006 +0100
wined3d: Move WINED3DRS_PATCHEDGESTYLE to the state table.
---
dlls/wined3d/device.c | 8 +-------
dlls/wined3d/state.c | 8 +++++++-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index c25c8f8..a52ec26 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3431,6 +3431,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_STIPPLEDALPHA :
case WINED3DRS_ANTIALIAS :
case WINED3DRS_MULTISAMPLEMASK :
+ case WINED3DRS_PATCHEDGESTYLE :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
@@ -3441,13 +3442,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
return WINED3DERR_INVALIDCALL;
}
- case WINED3DRS_PATCHEDGESTYLE :
- {
- if(WINED3DPATCHEDGE_DISCRETE != Value)
- ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value);
- break;
- }
-
case WINED3DRS_PATCHSEGMENTS :
{
/* available in d3d8 but in d3d9 it was replaced by IDirect3DDevice9::SetNPatchMode */
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 22dbfdd..1b1ecf9 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1172,6 +1172,12 @@ static void state_multisampmask(DWORD st
ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]);
}
+static void state_patchededge(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+ TRACE("Stub\n");
+ if (stateblock->renderState[WINED3DRS_PATCHEDGESTYLE] != D3DPATCHEDGE_DISCRETE)
+ ERR("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]);
+}
+
const struct StateEntry StateTable[] =
{
/* State name representative, apply function */
@@ -1340,7 +1346,7 @@ const struct StateEntry StateTable[] =
{ /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa },
{ /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask },
- { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown },
+ { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchededge },
{ /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown },
{ /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown },
{ /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax },
More information about the wine-cvs
mailing list