commit 4889c33da6831a909e505229bc59cf64461617ec
author Henri Verbeet <hverbeet@codeweavers.com> Tue May 18 09:53:07 2010 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue May 18 18:42:08 2010 +0200
tree 7ef9202cdf2ae8117f5f0fa946fc9ce02dad8718
parent 96cdab179245b18ef98be7cfa37f68ce43ee740e

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.

dlls/wined3d/context.c

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index ce20282..9cbdd46 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1967,10 +1967,10 @@
     return TRUE;
 }
 /* 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 */
-    IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil;
     IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)context->current_rt->container;
 
     if (!depth_stencil) return;
@@ -1992,7 +1992,7 @@
 {
     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)
         {
@@ -2032,7 +2032,8 @@
 
     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();
         context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil);
         LEAVE_GL();
@@ -2077,7 +2078,7 @@
 
     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)
         {