Mesa (master): winsys_handle: Change D3D12 resource handle type to void*

[GitLab Mirror]

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

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Tue Dec  8 09:53:52 2020 -0800

winsys_handle: Change D3D12 resource handle type to void*

This lets us include it in Linux builds as well, without needing
to pull in IUnknown.

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7937>

---

 src/gallium/include/frontend/winsys_handle.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/gallium/include/frontend/winsys_handle.h b/src/gallium/include/frontend/winsys_handle.h
index 9135983fc17..508feba472f 100644
--- a/src/gallium/include/frontend/winsys_handle.h
+++ b/src/gallium/include/frontend/winsys_handle.h
@@ -10,11 +10,7 @@ extern "C" {
 #define WINSYS_HANDLE_TYPE_KMS    1
 #define WINSYS_HANDLE_TYPE_FD     2
 #define WINSYS_HANDLE_TYPE_SHMID   3
-
-#ifdef _WIN32
-#include <unknwn.h>
 #define WINSYS_HANDLE_TYPE_D3D12_RES 4
-#endif
 
 /**
  * For use with pipe_screen::{texture_from_handle|texture_get_handle}.
@@ -66,13 +62,11 @@ struct winsys_handle
     */
    uint64_t modifier;
 
-#ifdef _WIN32
    /**
     * Input to resource_from_handle.
     * Output for resource_get_handle.
     */
-   IUnknown *com_obj;
-#endif
+   void *com_obj;
 };
 
 #ifdef __cplusplus