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

wined3d: Explicitly pass the depth/stencil surface to context_validate_onscreen_formats(). 

This avoids switching to offscreen rendering in context_apply_blit_state() for
a depth buffer that isn't going to be used anyway. This switch would be
problematic for blits to the frontbuffer, since it's always onscreen. I.e.,
we'd be blitting to the screen, but with offscreen transforms.
This commit is contained in:
Henri Verbeet 2010-05-18 09:53:07 +02:00 committed by Alexandre Julliard
parent 96cdab1792
commit 4889c33da6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/context.c
View File

@ -1967,10 +1967,10 @@ static BOOL match_depth_stencil_format(const struct wined3d_format_desc *existin
return TRUE; return TRUE;
} }
/* The caller provides a context */ /* The caller provides a context */
static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, struct wined3d_context *context) static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device,
struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil)
{ {
/* Onscreen surfaces are always in a swapchain */ /* Onscreen surfaces are always in a swapchain */
IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil;
IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)context->current_rt->container; IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)context->current_rt->container;
if (!depth_stencil) return; if (!depth_stencil) return;
@ -1992,7 +1992,7 @@ 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) context_validate_onscreen_formats(device, context, NULL);
if (context->render_offscreen) if (context->render_offscreen)
{ {
@ -2032,7 +2032,8 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm
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) context_validate_onscreen_formats(device, context, depth_stencil);
ENTER_GL(); ENTER_GL();
context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil);
LEAVE_GL(); LEAVE_GL();
@ -2077,7 +2078,7 @@ 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) context_validate_onscreen_formats(device, context, device->depth_stencil);
if (!context->render_offscreen) if (!context->render_offscreen)
{ {