wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict().

This undoes unintended change of wined3d_resource_check_fbo_attached() behaviour for pre-10.0 APIs. Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict().
eefc2a9c · Paul Gofman · Alexandre Julliard · 484e3f9c · eefc2a9c
Commit eefc2a9c authored Nov 01, 2019 by Paul Gofman Committed by Alexandre Julliard Nov 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

wined3d_private.h dlls/wined3d/wined3d_private.h +2 -2

No files found.
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5292,8 +5292,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte
 static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,
        const struct wined3d_format *srv_format)
 {
-    return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH))
+    return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH))
-            || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)));
+            || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL));
 }
 static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state,