[PATCH] WineD3D: Move the range fog support test to the template=0A=
Stefan Doesinger
stefan at codeweavers.com
Sat Jul 5 15:38:43 CDT 2008
=0A=
---=0A=
dlls/wined3d/state.c | 23 ++++++++++++-----------=0A=
1 files changed, 12 insertions(+), 11 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index f202a85..644cf79 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -1186,19 +1186,19 @@ static void state_fog(DWORD state, =
IWineD3DStateBlockImpl *stateblock, WineD3DCo=0A=
}=0A=
}=0A=
=0A=
+static void state_rangefog_w(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
+ if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) {=0A=
+ WARN("Range fog enabled, but not supported by this opengl =
implementation\n");=0A=
+ }=0A=
+}=0A=
+=0A=
static void state_rangefog(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) {=0A=
- if (GL_SUPPORT(NV_FOG_DISTANCE)) {=0A=
- glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV);=0A=
- checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, =
GL_EYE_RADIAL_NV)");=0A=
- } else {=0A=
- WARN("Range fog enabled, but not supported by this opengl =
implementation\n");=0A=
- }=0A=
+ glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV);=0A=
+ checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, =
GL_EYE_RADIAL_NV)");=0A=
} else {=0A=
- if (GL_SUPPORT(NV_FOG_DISTANCE)) {=0A=
- glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV);=0A=
- checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, =
GL_EYE_PLANE_ABSOLUTE_NV)");=0A=
- }=0A=
+ glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV);=0A=
+ checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, =
GL_EYE_PLANE_ABSOLUTE_NV)");=0A=
}=0A=
}=0A=
=0A=
@@ -4285,7 +4285,8 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=0A=
{ STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { =
STATE_RENDER(WINED3DRS_FOGENABLE), state_fog =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_FOGCOLOR), { =
STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_FOGDENSITY), { =
STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity =
}, 0 },=0A=
- { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { =
STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog =
}, 0 },=0A=
+ { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { =
STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog =
}, NV_FOG_DISTANCE },=0A=
+ { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { =
STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_CLIPPING), { =
STATE_RENDER(WINED3DRS_CLIPPING), state_clipping =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { =
STATE_RENDER(WINED3DRS_CLIPPING), state_clipping =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_LIGHTING), { =
STATE_RENDER(WINED3DRS_LIGHTING), state_lighting =
}, 0 },=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0015_01C8E609.EA032D30--
More information about the wine-patches
mailing list