Stefan Dösinger : wined3d: Move WINED3DRS_LINEPATTERN to the state table.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 11 10:34:49 CST 2006
Module: wine
Branch: master
Commit: 6a5d7df74f5fba4c509ce4ff735da382028eacf7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5d7df74f5fba4c509ce4ff735da382028eacf7
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sun Dec 10 23:20:01 2006 +0100
wined3d: Move WINED3DRS_LINEPATTERN to the state table.
---
dlls/wined3d/device.c | 23 +----------------------
dlls/wined3d/state.c | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 42d9308..0e13085 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3389,29 +3389,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_SPECULARMATERIALSOURCE :
case WINED3DRS_AMBIENTMATERIALSOURCE :
case WINED3DRS_EMISSIVEMATERIALSOURCE :
- StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
- break;
-
case WINED3DRS_LINEPATTERN :
- {
- union {
- DWORD d;
- WINED3DLINEPATTERN lp;
- } tmppattern;
- tmppattern.d = Value;
-
- TRACE("Line pattern: repeat %d bits %x\n", tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern);
-
- if (tmppattern.lp.wRepeatFactor) {
- glLineStipple(tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern);
- checkGLcall("glLineStipple(repeat, linepattern)");
- glEnable(GL_LINE_STIPPLE);
- checkGLcall("glEnable(GL_LINE_STIPPLE);");
- } else {
- glDisable(GL_LINE_STIPPLE);
- checkGLcall("glDisable(GL_LINE_STIPPLE);");
- }
- }
+ StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
case WINED3DRS_ZBIAS : /* D3D8 only */
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 24006cd..155872b 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -849,6 +849,26 @@ static void state_colormat(DWORD state,
}
}
+static void state_linepattern(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+ union {
+ DWORD d;
+ WINED3DLINEPATTERN lp;
+ } tmppattern;
+ tmppattern.d = stateblock->renderState[WINED3DRS_LINEPATTERN];
+
+ TRACE("Line pattern: repeat %d bits %x\n", tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern);
+
+ if (tmppattern.lp.wRepeatFactor) {
+ glLineStipple(tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern);
+ checkGLcall("glLineStipple(repeat, linepattern)");
+ glEnable(GL_LINE_STIPPLE);
+ checkGLcall("glEnable(GL_LINE_STIPPLE);");
+ } else {
+ glDisable(GL_LINE_STIPPLE);
+ checkGLcall("glDisable(GL_LINE_STIPPLE);");
+ }
+}
+
const struct StateEntry StateTable[] =
{
/* State name representative, apply function */
@@ -862,7 +882,7 @@ const struct StateEntry StateTable[] =
{ /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable },
{ /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode },
{ /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode },
- { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_unknown },
+ { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern },
{ /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_unknown },
{ /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), state_unknown },
{ /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), state_unknown },
More information about the wine-cvs
mailing list