projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wsi: deduplicate get_current_time() functions between display and x11
[mesa.git]
/
src
/
vulkan
/
wsi
/
meson.build
diff --git
a/src/vulkan/wsi/meson.build
b/src/vulkan/wsi/meson.build
index bfec376e9a7073f9f824d3e9cf0f942d836e6fa9..37555da6be030c4399ed13b0a6939013c109c973 100644
(file)
--- a/
src/vulkan/wsi/meson.build
+++ b/
src/vulkan/wsi/meson.build
@@
-18,16
+18,11
@@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-vulkan_wsi_args = []
vulkan_wsi_deps = []
vulkan_wsi_deps = []
-files_vulkan_wsi = files(
- 'wsi_common.c',
- 'wsi_common.h',
- 'wsi_common_queue.h',
-)
+files_vulkan_wsi = files('wsi_common.c')
+
if with_platform_x11
if with_platform_x11
- vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
vulkan_wsi_deps += [
dep_xcb,
dep_x11_xcb,
vulkan_wsi_deps += [
dep_xcb,
dep_x11_xcb,
@@
-37,29
+32,32
@@
if with_platform_x11
dep_xcb_sync,
dep_xshmfence,
]
dep_xcb_sync,
dep_xshmfence,
]
- files_vulkan_wsi += files(
- 'wsi_common_x11.c',
- 'wsi_common_x11.h',
- )
+ files_vulkan_wsi += files('wsi_common_x11.c')
endif
if with_platform_wayland
vulkan_wsi_deps += dep_wayland_client
endif
if with_platform_wayland
vulkan_wsi_deps += dep_wayland_client
- vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR']
- files_vulkan_wsi += files(
- 'wsi_common_wayland.c',
- 'wsi_common_wayland.h',
- )
+ files_vulkan_wsi += files('wsi_common_wayland.c')
files_vulkan_wsi += [
wayland_drm_client_protocol_h,
wayland_drm_protocol_c,
files_vulkan_wsi += [
wayland_drm_client_protocol_h,
wayland_drm_protocol_c,
+ linux_dmabuf_unstable_v1_client_protocol_h,
+ linux_dmabuf_unstable_v1_protocol_c,
]
endif
]
endif
+if with_platform_drm
+ files_vulkan_wsi += files('wsi_common_display.c')
+endif
+
+if with_xlib_lease
+ vulkan_wsi_deps += [dep_xcb_xrandr, dep_xlib_xrandr]
+endif
+
libvulkan_wsi = static_library(
'vulkan_wsi',
files_vulkan_wsi,
libvulkan_wsi = static_library(
'vulkan_wsi',
files_vulkan_wsi,
- include_directories : [inc_common, inc_vulkan_util],
+ include_directories : [inc_common, inc_vulkan_util
, inc_include
],
dependencies : [vulkan_wsi_deps, dep_libdrm],
c_args : [c_vis_args, vulkan_wsi_args],
build_by_default : false,
dependencies : [vulkan_wsi_deps, dep_libdrm],
c_args : [c_vis_args, vulkan_wsi_args],
build_by_default : false,