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

wined3d: context_validate_onscreen_formats() may modify context->render_offscreen. 

I merged this by accident in be43c867a5.
This commit is contained in:
Henri Verbeet 2010-05-18 09:53:06 +02:00 committed by Alexandre Julliard
parent b06e30d360
commit 96cdab1792
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/context.c
View File

@ -1992,6 +1992,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp
{ {
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{ {
if (!context->render_offscreen) context_validate_onscreen_formats(device, context);
if (context->render_offscreen) if (context->render_offscreen)
{ {
FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n"); FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n");
@ -2003,8 +2005,6 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp
} }
else else
{ {
context_validate_onscreen_formats(device, context);
ENTER_GL(); ENTER_GL();
context_bind_fbo(context, GL_FRAMEBUFFER, NULL); context_bind_fbo(context, GL_FRAMEBUFFER, NULL);
LEAVE_GL(); LEAVE_GL();
@ -2077,9 +2077,10 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{ {
if (!context->render_offscreen) context_validate_onscreen_formats(device, context);
if (!context->render_offscreen) if (!context->render_offscreen)
{ {
context_validate_onscreen_formats(device, context);
ENTER_GL(); ENTER_GL();
context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL); context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL);
LEAVE_GL(); LEAVE_GL();