OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix build on windows

Browse Source 
guard the drm includes that are not available on this platform

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7432>
This commit is contained in:
Michel Zou
2020-11-03 18:42:58 +01:00
parent db9d13b4ff
commit 5f99962540
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/zink/zink_resource.c
View File

@@ -38,7 +38,13 @@
#include "frontend/sw_winsys.h" #include "frontend/sw_winsys.h"
#ifndef _WIN32
#define ZINK_USE_DMABUF
#endif
#ifdef ZINK_USE_DMABUF
#include "drm-uapi/drm_fourcc.h" #include "drm-uapi/drm_fourcc.h"
#endif
static void static void
zink_resource_destroy(struct pipe_screen *pscreen, zink_resource_destroy(struct pipe_screen *pscreen,
@@ -360,6 +366,7 @@ zink_resource_get_handle(struct pipe_screen *pscreen,
} }
if (whandle->type == WINSYS_HANDLE_TYPE_FD) { if (whandle->type == WINSYS_HANDLE_TYPE_FD) {
#ifdef ZINK_USE_DMABUF
fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
fd_info.memory = res->mem; fd_info.memory = res->mem;
fd_info.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; fd_info.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
@@ -368,6 +375,9 @@ zink_resource_get_handle(struct pipe_screen *pscreen,
return false; return false;
whandle->handle = fd; whandle->handle = fd;
whandle->modifier = DRM_FORMAT_MOD_INVALID; whandle->modifier = DRM_FORMAT_MOD_INVALID;
#else
return false;
#endif
} }
return true; return true;
} }
@@ -378,10 +388,14 @@ zink_resource_from_handle(struct pipe_screen *pscreen,
struct winsys_handle *whandle, struct winsys_handle *whandle,
unsigned usage) unsigned usage)
{ {
#ifdef ZINK_USE_DMABUF
if (whandle->modifier != DRM_FORMAT_MOD_INVALID) if (whandle->modifier != DRM_FORMAT_MOD_INVALID)
return NULL; return NULL;
return resource_create(pscreen, templ, whandle, usage); return resource_create(pscreen, templ, whandle, usage);
#else
return NULL;
#endif
} }
static bool static bool