Module: wine Branch: master Commit: b648b7419170836aaae7192fba5ef974d47fe46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b648b7419170836aaae7192fba...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Jun 18 16:17:18 2013 +0200
wined3d: Pass fogstart==fogend to GL in fog table mode.
---
dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/state.c | 13 ++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fd2df68..3082ba4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6513,6 +6513,8 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi static void state_arbfp_fog(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND];
TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);
@@ -6541,7 +6543,7 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 new_source = FOGSOURCE_FFP; }
- if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e14d7ab..ad9be6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7086,6 +7086,8 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, { BOOL use_vshader = use_vs(state); enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND];
context->select_shader = 1; context->load_constants = 1; @@ -7107,7 +7109,7 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, new_source = FOGSOURCE_FFP; }
- if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ffce803..5d6355b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1043,8 +1043,13 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta fogstart = tmpvalue.f; tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; fogend = tmpvalue.f; - /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ - if(fogstart == fogend) { + /* Special handling for fogstart == fogend. In d3d with vertex + * fog, everything is fogged. With table fog, everything with + * fog_coord < fog_start is unfogged, and fog_coord > fog_start + * is fogged. Windows drivers disagree when fog_coord == fog_start. */ + if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE + && fogstart == fogend) + { fogstart = -INFINITY; fogend = 0.0f; } @@ -1072,6 +1077,8 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st { const struct wined3d_gl_info *gl_info = context->gl_info; enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND];
TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);
@@ -1217,7 +1224,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st
glEnableWINE(GL_FOG); checkGLcall("glEnable GL_FOG"); - if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART));
-
Alexandre Julliard