winsys_handle: Change D3D12 resource handle type to void*
authorJesse Natalie <jenatali@microsoft.com>
Tue, 8 Dec 2020 17:53:52 +0000 (09:53 -0800)
committerMarge Bot <eric+marge@anholt.net>
Wed, 16 Dec 2020 16:25:54 +0000 (16:25 +0000)
This lets us include it in Linux builds as well, without needing
to pull in IUnknown.

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

src/gallium/include/frontend/winsys_handle.h

index 9135983..508feba 100644 (file)
@@ -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