diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f61ff37..51a71a1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: container: alpine:3.23 steps: - run: apk --no-cache add git gcc g++ binutils pkgconf meson=1.9.1-r0 ninja musl-dev wayland-dev wayland-protocols libinput-dev libevdev-dev libxkbcommon-dev pixman-dev glm-dev libdrm-dev mesa-dev cairo-dev pango-dev eudev-dev libxml2-dev glibmm-dev libseat-dev libdisplay-info-dev hwdata-dev yyjson-dev boost-dev + - run: git clone https://gitlab.freedesktop.org/wayland/wayland-protocols -b 1.47 && cd wayland-protocols && meson setup build --prefix=/usr && ninja -C build && ninja -C build install && cd .. && rm -rf wayland-protocols - name: Wayfire uses: actions/checkout@v2 with: @@ -25,6 +26,7 @@ jobs: container: alpine:3.23 steps: - run: apk --no-cache add git gcc g++ binutils pkgconf meson=1.9.1-r0 ninja musl-dev wayland-dev wayland-protocols libinput-dev libevdev-dev libxkbcommon-dev pixman-dev glm-dev libdrm-dev mesa-dev cairo-dev pango-dev eudev-dev libxml2-dev glibmm-dev libseat-dev libxcb-dev xcb-util-wm-dev xwayland libdisplay-info-dev hwdata-dev yyjson-dev boost-dev + - run: git clone https://gitlab.freedesktop.org/wayland/wayland-protocols -b 1.47 && cd wayland-protocols && meson setup build --prefix=/usr && ninja -C build && ninja -C build install && cd .. && rm -rf wayland-protocols - name: Wayfire uses: actions/checkout@v2 with: diff --git a/src/mag.cpp b/src/mag.cpp index 02e3f7d..ba7e711 100644 --- a/src/mag.cpp +++ b/src/mag.cpp @@ -71,7 +71,8 @@ class mag_view_t : public wf::toplevel_view_interface_t /* Draw the inside of the rect, if we have already captured the output's contents */ if (view->mag_tex.get_buffer() != NULL) { - data.pass->add_texture({view->mag_tex.get_texture()}, data.target, geometry, data.damage); + data.pass->add_texture(wf::texture_t::from_aux( + view->mag_tex), data.target, geometry, data.damage); } } }; diff --git a/src/showrepaint.cpp b/src/showrepaint.cpp index 580bc9e..caa70ad 100644 --- a/src/showrepaint.cpp +++ b/src/showrepaint.cpp @@ -167,9 +167,8 @@ class wayfire_showrepaint : public wf::per_output_plugin_instance_t */ if (last_buffer.get_size().width > 0) { - wf::texture_t texture; - texture.texture = last_buffer.get_texture(); - texture.transform = target_fb.wl_transform; + std::shared_ptr texture = wf::texture_t::from_aux(last_buffer); + texture->set_transform(target_fb.wl_transform); rpass->add_texture(texture, target_fb, target_fb.geometry, inverted_damage); } }; diff --git a/src/window-zoom.cpp b/src/window-zoom.cpp index a3b1197..56eee24 100644 --- a/src/window-zoom.cpp +++ b/src/window-zoom.cpp @@ -123,7 +123,7 @@ class simple_node_render_instance_t : public transformer_render_instance_tset_filter_mode(nearest_filtering ? WLR_SCALE_FILTER_NEAREST : WLR_SCALE_FILTER_BILINEAR); data.pass->add_texture(src_tex, data.target, scaled_geometry, data.damage); } };