ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Only invalidate state for the current context in device_clear_render_targets().

This commit is contained in:
Henri Verbeet 2011-07-27 21:13:35 +02:00 committed by Alexandre Julliard
parent 7e3f85cab6
commit a1ba5b5131
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wined3d/device.c
View File

@ -707,10 +707,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count
if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE]) if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE])
{ {
glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT);
device_invalidate_state(device, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE));
} }
glStencilMask(~0U); glStencilMask(~0U);
device_invalidate_state(device, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_STENCILWRITEMASK));
glClearStencil(stencil); glClearStencil(stencil);
checkGLcall("glClearStencil"); checkGLcall("glClearStencil");
clear_mask = clear_mask | GL_STENCIL_BUFFER_BIT; clear_mask = clear_mask | GL_STENCIL_BUFFER_BIT;
@ -730,7 +730,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count
surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE);
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
device_invalidate_state(device, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE));
glClearDepth(depth); glClearDepth(depth);
checkGLcall("glClearDepth"); checkGLcall("glClearDepth");
clear_mask = clear_mask | GL_DEPTH_BUFFER_BIT; clear_mask = clear_mask | GL_DEPTH_BUFFER_BIT;
@ -744,10 +744,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count
} }
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));
device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1));
device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2));
device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3));
glClearColor(color->r, color->g, color->b, color->a); glClearColor(color->r, color->g, color->b, color->a);
checkGLcall("glClearColor"); checkGLcall("glClearColor");
clear_mask = clear_mask | GL_COLOR_BUFFER_BIT; clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;