Skip to content

W
wine-winehq
Commit 4e53faf7 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Disable the depth stencil on multisample mismatch.

parent cce57e9e
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 4 deletions
dlls/wined3d/context.c
View file @ 4e53faf7
...@@ -420,6 +420,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ ...@@ -420,6 +420,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
unsigned int i; unsigned int i;
GLuint read_binding, draw_binding; GLuint read_binding, draw_binding;
struct wined3d_surface *depth_stencil = entry->depth_stencil;
if (entry->attached) if (entry->attached)
{ {
...@@ -437,10 +438,22 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ ...@@ -437,10 +438,22 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ
context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->color_location); context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->color_location);
} }
/* Apply depth targets */ if (depth_stencil && entry->render_targets[0]
if (entry->depth_stencil) && (depth_stencil->resource.multisample_type
surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); != entry->render_targets[0]->resource.multisample_type
context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, entry->ds_location); || depth_stencil->resource.multisample_quality
!= entry->render_targets[0]->resource.multisample_quality))
{
WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n",
entry->render_targets[0]->resource.multisample_quality,
entry->render_targets[0]->resource.multisample_type,
depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type);
depth_stencil = NULL;
}
if (depth_stencil)
surface_set_compatible_renderbuffer(depth_stencil, entry->render_targets[0]);
context_attach_depth_stencil_fbo(context, target, depth_stencil, entry->ds_location);
/* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility
* GL contexts requirements. */ * GL contexts requirements. */
......
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