Skip to content

fix: import dmabuf as vulkan render target #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
deepin-wm wants to merge 1 commit into from
Closed

fix: import dmabuf as vulkan render target #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/treeland-archlinux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install graphics and wayland dependencies
run: |
# Core graphics and wayland dependencies (matching qwlroots and waylib builds)
pacman -S --noconfirm --noprogressbar pixman vulkan-headers wayland wayland-protocols wlr-protocols libxcb mesa
pacman -S --noconfirm --noprogressbar pixman vulkan-headers wayland wayland-protocols wlr-protocols libxcb
pacman -S --noconfirm --noprogressbar wlroots0.19 libinput pam systemd-libs jemalloc gcc-libs glibc

- name: Install additional waylib/qwlroots dependencies
Expand Down
8 changes: 8 additions & 0 deletions waylib/src/server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ pkg_search_module(PIXMAN REQUIRED IMPORTED_TARGET pixman-1)
pkg_search_module(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
pkg_search_module(XCB REQUIRED IMPORTED_TARGET xcb)
pkg_search_module(EGL REQUIRED IMPORTED_TARGET egl)
# Optional: wvulkandmabufimport.cpp calls Vulkan loader functions directly.
# Only linked when present; the code is compiled out without ENABLE_VULKAN_RENDER.
pkg_search_module(VULKAN IMPORTED_TARGET vulkan)

add_compile_definitions(WLR_PRIVATE=)

Expand Down Expand Up @@ -151,6 +154,7 @@ set(SOURCES
qtquick/private/wqmlhelper.cpp
qtquick/private/wbufferrenderer.cpp
qtquick/private/wrenderbuffernode.cpp
qtquick/private/wvulkandmabufimport.cpp

${WAYLAND_PROTOCOLS_OUTPUTDIR}/text-input-unstable-v1-protocol.c
${WAYLAND_PROTOCOLS_OUTPUTDIR}/text-input-unstable-v2-protocol.c
Expand Down Expand Up @@ -332,6 +336,7 @@ set(PRIVATE_HEADERS
qtquick/private/wbufferrenderer_p.h
qtquick/private/wrenderbuffernode_p.h
qtquick/private/wsurfaceitem_p.h
qtquick/private/wvulkandmabufimport_p.h

${WAYLAND_PROTOCOLS_OUTPUTDIR}/text-input-unstable-v1-protocol.h
${WAYLAND_PROTOCOLS_OUTPUTDIR}/text-input-unstable-v2-protocol.h
Expand Down Expand Up @@ -407,6 +412,9 @@ target_link_libraries(${TARGET}
PkgConfig::XCB
PkgConfig::EGL
)
if(TARGET PkgConfig::VULKAN)
target_link_libraries(${TARGET} PRIVATE PkgConfig::VULKAN)
endif()

target_link_libraries(${TARGET}
PUBLIC
Expand Down
Loading
Loading