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

wined3d: Fix context_apply_draw_buffers() with backbuffer ORM.

This commit is contained in:
Matteo Bruni 2011-06-21 18:28:36 +02:00 committed by Alexandre Julliard
parent 5b67bd4fb2
commit 0919ac3b51
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wined3d/context.c
View File

@ -2029,8 +2029,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt
} }
else else
{ {
glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); ERR("Unexpected draw buffers mask with backbuffer ORM.\n");
checkGLcall("glDrawBuffer()");
} }
} }
} }
@ -2095,6 +2094,16 @@ static void context_validate_onscreen_formats(struct wined3d_device *device,
context_set_render_offscreen(context, device->StateTable, TRUE); context_set_render_offscreen(context, device->StateTable, TRUE);
} }
static DWORD generate_rt_mask_no_fbo(struct wined3d_device *device, struct wined3d_surface *rt)
{
if (!rt || rt->resource.format->id == WINED3DFMT_NULL)
return 0;
else if (rt->container.type == WINED3D_CONTAINER_SWAPCHAIN)
return generate_rt_mask_from_surface(rt);
else
return generate_rt_mask(device->offscreenBuffer);
}
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device)
{ {
@ -2123,7 +2132,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de
} }
else else
{ {
rt_mask = generate_rt_mask_from_surface(context->current_rt); rt_mask = generate_rt_mask_no_fbo(device, context->current_rt);
} }
ENTER_GL(); ENTER_GL();
@ -2203,7 +2212,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d
} }
else else
{ {
rt_mask = generate_rt_mask_from_surface(rts[0]); rt_mask = generate_rt_mask_no_fbo(device, rts[0]);
} }
ENTER_GL(); ENTER_GL();
@ -2285,7 +2294,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de
} }
else else
{ {
rt_mask = generate_rt_mask_from_surface(fb->render_targets[0]); rt_mask = generate_rt_mask_no_fbo(device, fb->render_targets[0]);
} }
ENTER_GL(); ENTER_GL();