Skip to content

W
wine-winehq
Commit 96cdab17 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

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

I merged this by accident in be43c867.
parent b06e30d3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/wined3d/context.c
View file @ 96cdab17
......@@ -1992,6 +1992,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp
{
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{
if (!context->render_offscreen) context_validate_onscreen_formats(device, context);
if (context->render_offscreen)
{
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
{
context_validate_onscreen_formats(device, context);
ENTER_GL();
context_bind_fbo(context, GL_FRAMEBUFFER, NULL);
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 (!context->render_offscreen) context_validate_onscreen_formats(device, context);
if (!context->render_offscreen)
{
context_validate_onscreen_formats(device, context);
ENTER_GL();
context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL);
LEAVE_GL();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment