Mesa (master): d3d12: Support WINSYS_HANDLE_TYPE_D3D12_RES

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Apr  8 14:44:59 2020 +0200

d3d12: Support WINSYS_HANDLE_TYPE_D3D12_RES

Reviewed-by: Charmaine Lee <charmainel at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7535>

---

 src/gallium/drivers/d3d12/d3d12_resource.cpp | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_resource.cpp b/src/gallium/drivers/d3d12/d3d12_resource.cpp
index 52adedccb96..330481311bd 100644
--- a/src/gallium/drivers/d3d12/d3d12_resource.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_resource.cpp
@@ -278,7 +278,21 @@ d3d12_resource_from_handle(struct pipe_screen *pscreen,
                           const struct pipe_resource *templ,
                           struct winsys_handle *handle, unsigned usage)
 {
-   return NULL;
+   if (handle->type != WINSYS_HANDLE_TYPE_D3D12_RES)
+      return NULL;
+
+   struct d3d12_resource *res = CALLOC_STRUCT(d3d12_resource);
+   if (!res)
+      return NULL;
+
+   res->base = *templ;
+   pipe_reference_init(&res->base.reference, 1);
+   res->base.screen = pscreen;
+   res->dxgi_format = templ->target == PIPE_BUFFER ? DXGI_FORMAT_UNKNOWN :
+                 d3d12_get_format(templ->format);
+   res->bo = d3d12_bo_wrap_res((ID3D12Resource *)handle->com_obj, templ->format);
+   init_valid_range(res);
+   return &res->base;
 }
 
 static bool
@@ -288,7 +302,14 @@ d3d12_resource_get_handle(struct pipe_screen *pscreen,
                           struct winsys_handle *handle,
                           unsigned usage)
 {
-   return false;
+   struct d3d12_screen *screen = d3d12_screen(pscreen);
+   struct d3d12_resource *res = d3d12_resource(pres);
+
+   if (handle->type != WINSYS_HANDLE_TYPE_D3D12_RES)
+      return false;
+
+   handle->com_obj = d3d12_resource_resource(res);
+   return true;
 }
 
 void