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>
This commit is contained in:
parent
484e3f9c4c
commit
eefc2a9c64
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue