Henri Verbeet : wined3d: Only invalidate state for the current context in surface_blt_fbo().
Alexandre Julliard
julliard at winehq.org
Thu Jul 28 13:55:40 CDT 2011
Module: wine
Branch: master
Commit: 2bf020e26fcee9f09dbb167f4db8c1126053ae1d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf020e26fcee9f09dbb167f4db8c1126053ae1d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jul 27 21:13:33 2011 +0200
wined3d: Only invalidate state for the current context in surface_blt_fbo().
---
dlls/wined3d/surface.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d34bcd5..3d9bfb7 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5105,16 +5105,16 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF
context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0);
}
context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER);
- device_invalidate_state(device, STATE_FRAMEBUFFER);
+ context_invalidate_state(context, STATE_FRAMEBUFFER);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
- device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));
- device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1));
- device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2));
- device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3));
+ context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));
+ context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1));
+ context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2));
+ context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3));
glDisable(GL_SCISSOR_TEST);
- device_invalidate_state(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));
+ context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));
gl_info->fbo_ops.glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom,
dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter);
More information about the wine-cvs
mailing list