Module: wine Branch: master Commit: 8a5bf91b4e0bd797d874dccc918250f84d8633a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5bf91b4e0bd797d874dccc91...
Author: Stefan Dösinger stefan@codeweavers.com Date: Sun Dec 10 23:13:38 2006 +0100
wined3d: Move SRGBWRITEENABLE 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 baec6aa..b2c129e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3437,6 +3437,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ADAPTIVETESS_Z : case WINED3DRS_ADAPTIVETESS_W : case WINED3DRS_ENABLEADAPTIVETESSELLATION: + case WINED3DRS_SRGBWRITEENABLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break;
@@ -3447,13 +3448,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; }
- case WINED3DRS_SRGBWRITEENABLE : - { - if(Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_SEPARATEALPHABLENDENABLE : { if(Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ff016ce..44e1d47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1208,6 +1208,12 @@ static void state_tessellation(DWORD sta FIXME("(WINED3DRS_ENABLEADAPTIVETESSELLATION,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]); }
+ +static void state_srgbwrite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + ERR("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1409,7 +1415,7 @@ const struct StateEntry StateTable[] = { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, - { /*194, WINED3DRS_SRGBWRITEENABLE */ 0, state_nogl }, + { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), state_srgbwrite }, { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined },