Henri Verbeet : vkd3d: Introduce d3d12_box_is_empty().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 65417717ac10ee93ddb64dd432212bc2bc0e8322
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=65417717ac10ee93ddb64dd4...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Oct 18 17:46:54 2019 +0330

vkd3d: Introduce d3d12_box_is_empty().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d/resource.c      | 4 ++--
 libs/vkd3d/vkd3d_private.h | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 69cf653..27d6a02 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -1352,7 +1352,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc
         return E_INVALIDARG;
     }
 
-    if (dst_box->right <= dst_box->left || dst_box->bottom <= dst_box->top || dst_box->back <= dst_box->front)
+    if (d3d12_box_is_empty(dst_box))
     {
         WARN("Empty box %s.\n", debug_d3d12_box(dst_box));
         return S_OK;
@@ -1454,7 +1454,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour
         return E_INVALIDARG;
     }
 
-    if (src_box->right <= src_box->left || src_box->bottom <= src_box->top || src_box->back <= src_box->front)
+    if (d3d12_box_is_empty(src_box))
     {
         WARN("Empty box %s.\n", debug_d3d12_box(src_box));
         return S_OK;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 59f0eac..ee1c463 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1168,6 +1168,11 @@ static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc(
             desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
 }
 
+static inline bool d3d12_box_is_empty(const D3D12_BOX *box)
+{
+    return box->right <= box->left || box->bottom <= box->top || box->back <= box->front;
+}
+
 static inline unsigned int d3d12_resource_desc_get_width(const D3D12_RESOURCE_DESC *desc,
         unsigned int miplevel_idx)
 {