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

wined3d: Add ActivateContext in color_fill_fbo. 

Also removes dirtifying of SCISSORTESTENABLE state that is made
redundant by ActivateContext(...,CTXUSAGE_CLEAR).
This commit is contained in:
Alexander Dorofeyev 2008-07-30 01:24:43 +03:00 committed by Alexandre Julliard
parent 47edb3cbab
commit 76e02581a9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/device.c
View File

@ -6182,12 +6182,17 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS
TRACE("Surface %p is onscreen\n", surface); TRACE("Surface %p is onscreen\n", surface);
ActivateContext(This, surface, CTXUSAGE_CLEAR);
ENTER_GL();
GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0));
buffer = surface_get_gl_buffer(surface, swapchain); buffer = surface_get_gl_buffer(surface, swapchain);
glDrawBuffer(buffer); glDrawBuffer(buffer);
checkGLcall("glDrawBuffer()"); checkGLcall("glDrawBuffer()");
} else { } else {
TRACE("Surface %p is offscreen\n", surface); TRACE("Surface %p is offscreen\n", surface);
ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_CLEAR);
ENTER_GL();
bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->dst_fbo); bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->dst_fbo);
attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, surface); attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, surface);
GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0));
@ -6206,7 +6211,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS
} else { } else {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }
IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));
@ -6227,6 +6231,8 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS
glDrawBuffer(GL_BACK); glDrawBuffer(GL_BACK);
checkGLcall("glDrawBuffer()"); checkGLcall("glDrawBuffer()");
} }
LEAVE_GL();
} }
static inline DWORD argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) { static inline DWORD argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) {
@ -6348,9 +6354,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD
} }
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) {
ENTER_GL();
color_fill_fbo(iface, pSurface, pRect, color); color_fill_fbo(iface, pSurface, pRect, color);
LEAVE_GL();
return WINED3D_OK; return WINED3D_OK;
} else { } else {
/* Just forward this to the DirectDraw blitting engine */ /* Just forward this to the DirectDraw blitting engine */