[PATCH] WineD3D: Move the point sprite support test into the =
Stefan Doesinger
stefan at codeweavers.com
Sat Jul 5 15:49:50 CDT 2008
template=0A=
=0A=
---=0A=
dlls/wined3d/state.c | 10 ++++++----=0A=
1 files changed, 6 insertions(+), 4 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index ee1f5a8..f5b87cf 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -1586,13 +1586,14 @@ static void state_lastpixel(DWORD state, =
IWineD3DStateBlockImpl *stateblock, Win=0A=
}=0A=
}=0A=
=0A=
-static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
+static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
/* TODO: NV_POINT_SPRITE */=0A=
- if (!GL_SUPPORT(ARB_POINT_SPRITE)) {=0A=
+ if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) {=0A=
TRACE("Point sprites not supported\n");=0A=
- return;=0A=
}=0A=
+}=0A=
=0A=
+static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) {=0A=
glEnable(GL_POINT_SPRITE_ARB);=0A=
checkGLcall("glEnable(GL_POINT_SPRITE_ARB)");=0A=
@@ -4333,7 +4334,8 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=0A=
{ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { =
STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb =
}, ARB_POINT_PARAMETERS },=0A=
{ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { =
STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext =
}, EXT_POINT_PARAMETERS },=0A=
{ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { =
STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w =
}, 0 },=0A=
- { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { =
STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite =
}, 0 },=0A=
+ { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { =
STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite =
}, ARB_POINT_SPRITE },=0A=
+ { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { =
STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite_w =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_POINTSCALE_A), { =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_POINTSCALE_B), { =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale =
}, 0 },=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_000F_01C8E78B.FB7EF110--
More information about the wine-patches
mailing list