Mesa (main): d3d12: Fix NV12 resource importing

[GitLab Mirror]

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

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Mon Dec 20 15:29:57 2021 -0800

d3d12: Fix NV12 resource importing

Fixes: a6db8054 ("d3d12: Handle opening planar resources")
Reviewed-by: Sil Vilerino <sivileri at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14276>

---

 src/gallium/drivers/d3d12/d3d12_resource.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_resource.cpp b/src/gallium/drivers/d3d12/d3d12_resource.cpp
index f6ce28d4afa..e35b0cc4b3a 100644
--- a/src/gallium/drivers/d3d12/d3d12_resource.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_resource.cpp
@@ -460,9 +460,9 @@ d3d12_resource_from_handle(struct pipe_screen *pscreen,
       }
       unsigned templ_samples = MAX2(templ->nr_samples, 1);
       if (res->base.b.target != templ->target ||
-          res->base.b.width0 != templ->width0 ||
-          res->base.b.height0 != templ->height0 ||
-          res->base.b.depth0 != templ->depth0 ||
+          footprint->Width != templ->width0 ||
+          footprint->Height != templ->height0 ||
+          footprint->Depth != templ->depth0 ||
           res->base.b.array_size != templ->array_size ||
           incoming_res_desc.SampleDesc.Count != templ_samples ||
           res->base.b.last_level != templ->last_level) {
@@ -471,9 +471,9 @@ d3d12_resource_from_handle(struct pipe_screen *pscreen,
             "depth: %d vs %d, array_size: %d vs %d, samples: %d vs %d, mips: %d vs %d\n",
             handle->plane,
             res->base.b.target, templ->target,
-            res->base.b.width0, templ->width0,
-            res->base.b.height0, templ->height0,
-            res->base.b.depth0, templ->depth0,
+            footprint->Width, templ->width0,
+            footprint->Height, templ->height0,
+            footprint->Depth, templ->depth0,
             res->base.b.array_size, templ->array_size,
             incoming_res_desc.SampleDesc.Count, templ_samples,
             res->base.b.last_level + 1, templ->last_level + 1);