Mesa (main): d3d12: Always respect offsets when mapping a bo, not just when there's a range

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: caae9b0e1fa4ca1c5f205a4e5df02bc03347b196
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=caae9b0e1fa4ca1c5f205a4e5df02bc03347b196

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Tue Feb  8 05:49:38 2022 -0800

d3d12: Always respect offsets when mapping a bo, not just when there's a range

Reviewed-by: Sil Vilerino <sivileri at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14933>

---

 src/gallium/drivers/d3d12/d3d12_bufmgr.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp b/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
index e06b55dcfb4..c9b15aef21f 100644
--- a/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
@@ -170,9 +170,7 @@ d3d12_bo_map(struct d3d12_bo *bo, D3D12_RANGE *range)
 
    base_bo = d3d12_bo_get_base(bo, &offset);
 
-   if (!range || offset == 0) {
-      /* Nothing to do */
-   } else if (range->Begin >= range->End) {
+   if (!range || range->Begin >= range->End) {
       offset_range.Begin = offset;
       offset_range.End = offset + d3d12_bo_get_size(bo);
       range = &offset_range;
@@ -197,10 +195,7 @@ d3d12_bo_unmap(struct d3d12_bo *bo, D3D12_RANGE *range)
 
    base_bo = d3d12_bo_get_base(bo, &offset);
 
-   if (!range || bo == base_bo)
-   {
-      /* Nothing to do */
-   } else if (range->Begin >= range->End) {
+   if (!range || range->Begin >= range->End) {
       offset_range.Begin = offset;
       offset_range.End = offset + d3d12_bo_get_size(bo);
       range = &offset_range;