Skip to content

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

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.
parent 96cdab17
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
dlls/wined3d/context.c
View file @ 4889c33d
......@@ -1967,10 +1967,10 @@ static BOOL match_depth_stencil_format(const struct wined3d_format_desc *existin
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 @@ 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) context_validate_onscreen_formats(device, context, NULL);
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 (!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 @@ 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, device->depth_stencil);
if (!context->render_offscreen)
{
......
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