Module: wine Branch: master Commit: eefc2a9c64337c418d847b8e914ab31fddd538eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefc2a9c64337c418d847b8e9...
Author: Paul Gofman gofmanp@gmail.com Date: Fri Nov 1 11:02:43 2019 +0300
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
---
dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82161c9034..61096a0345 100644 --- 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)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); + 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)); }
static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state,