marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Truncate stencil reference values to the stencil component size. 

As opposed to OpenGL, which clamps them. This fixes a regression introduced by
commit a9e199e5ad.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Zhiyi Zhang 2019-08-28 21:14:28 +04:30 committed by Alexandre Julliard
parent c67a27c87f
commit 124f48d311
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d9/tests/visual.c
View File

@ -11211,7 +11211,7 @@ static void stencil_cull_test(void)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
color = getPixelColor(device, 280, 360);
todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color);
ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color);
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

7
dlls/wined3d/cs.c
View File

@ -1152,9 +1152,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const
device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK));
device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS));
}
else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale)
else if (prev)
{
device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS));
if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale)
device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS));
if (prev->format->stencil_size != op->view->format->stencil_size)
device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF));
}
device_invalidate_state(device, STATE_FRAMEBUFFER);

2
dlls/wined3d/state.c
View File

@ -925,7 +925,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC])))
func_back = GL_ALWAYS;
mask = state->render_states[WINED3D_RS_STENCILMASK];
ref = state->render_states[WINED3D_RS_STENCILREF] & mask;
ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1);
stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]);
depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]);
stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);