Stefan Dösinger : wined3d: Move WINED3DRS_POINTSPRITEENABLE to the state table.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 11 10:34:52 CST 2006
Module: wine
Branch: master
Commit: 920225d4a45308c9e89d5e116d4426ed2f8c60bd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=920225d4a45308c9e89d5e116d4426ed2f8c60bd
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sun Dec 10 23:20:36 2006 +0100
wined3d: Move WINED3DRS_POINTSPRITEENABLE to the state table.
---
dlls/wined3d/device.c | 26 +-------------------------
dlls/wined3d/state.c | 26 +++++++++++++++++++++++++-
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 592ca84..57527ad 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3406,6 +3406,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_LOCALVIEWER :
case WINED3DRS_LASTPIXEL :
case WINED3DRS_SOFTWAREVERTEXPROCESSING :
+ case WINED3DRS_POINTSPRITEENABLE :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
@@ -3415,31 +3416,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
LEAVE_GL();
return WINED3DERR_INVALIDCALL;
}
- case WINED3DRS_POINTSPRITEENABLE :
- {
- /* TODO: NV_POINT_SPRITE */
- if (!GL_SUPPORT(ARB_POINT_SPRITE)) {
- TRACE("Point sprites not supported\n");
- break;
- }
-
- /*
- * Point sprites are always enabled. Value controls texture coordinate
- * replacement mode. Must be set true for point sprites to use
- * textures.
- */
- glEnable(GL_POINT_SPRITE_ARB);
- checkGLcall("glEnable(GL_POINT_SPRITE_ARB)");
-
- if (Value) {
- glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE);
- checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)");
- } else {
- glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE);
- checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)");
- }
- break;
- }
case WINED3DRS_WRAP0 :
case WINED3DRS_WRAP1 :
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 01dbc0c..bf1897e 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1044,6 +1044,30 @@ static void state_lastpixel(DWORD state,
}
}
+static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+ /* TODO: NV_POINT_SPRITE */
+ if (!GL_SUPPORT(ARB_POINT_SPRITE)) {
+ TRACE("Point sprites not supported\n");
+ return;
+ }
+
+ /*
+ * Point sprites are always enabled. Value controls texture coordinate
+ * replacement mode. Must be set true for point sprites to use
+ * textures.
+ */
+ glEnable(GL_POINT_SPRITE_ARB);
+ checkGLcall("glEnable(GL_POINT_SPRITE_ARB)");
+
+ if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) {
+ glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE);
+ checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)");
+ } else {
+ glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE);
+ checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)");
+ }
+}
+
const struct StateEntry StateTable[] =
{
/* State name representative, apply function */
@@ -1205,7 +1229,7 @@ const struct StateEntry StateTable[] =
{ /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl },
{ /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize },
{ /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin },
- { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_unknown },
+ { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite },
{ /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
More information about the wine-cvs
mailing list