Skip to content

Commit c9105ae

Browse files
committed
Track wayfire plugin API changes
1 parent 741f8ba commit c9105ae

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
container: alpine:3.23
99
steps:
1010
- 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
11+
- 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
1112
- name: Wayfire
1213
uses: actions/checkout@v2
1314
with:
@@ -25,6 +26,7 @@ jobs:
2526
container: alpine:3.23
2627
steps:
2728
- 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
29+
- 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
2830
- name: Wayfire
2931
uses: actions/checkout@v2
3032
with:

src/mag.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ class mag_view_t : public wf::toplevel_view_interface_t
7171
/* Draw the inside of the rect, if we have already captured the output's contents */
7272
if (view->mag_tex.get_buffer() != NULL)
7373
{
74-
data.pass->add_texture({view->mag_tex.get_texture()}, data.target, geometry, data.damage);
74+
data.pass->add_texture(wf::texture_t::from_aux(
75+
view->mag_tex), data.target, geometry, data.damage);
7576
}
7677
}
7778
};

src/showrepaint.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ class wayfire_showrepaint : public wf::per_output_plugin_instance_t
167167
*/
168168
if (last_buffer.get_size().width > 0)
169169
{
170-
wf::texture_t texture;
171-
texture.texture = last_buffer.get_texture();
172-
texture.transform = target_fb.wl_transform;
170+
std::shared_ptr<wf::texture_t> texture = wf::texture_t::from_aux(last_buffer);
171+
texture->set_transform(target_fb.wl_transform);
173172
rpass->add_texture(texture, target_fb, target_fb.geometry, inverted_damage);
174173
}
175174
};

src/window-zoom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class simple_node_render_instance_t : public transformer_render_instance_t<trans
123123
{
124124
auto src_tex = get_texture(1.0);
125125
auto scaled_geometry = get_scaled_geometry();
126-
src_tex.filter_mode = nearest_filtering ? WLR_SCALE_FILTER_NEAREST : WLR_SCALE_FILTER_BILINEAR;
126+
src_tex->set_filter_mode(nearest_filtering ? WLR_SCALE_FILTER_NEAREST : WLR_SCALE_FILTER_BILINEAR);
127127
data.pass->add_texture(src_tex, data.target, scaled_geometry, data.damage);
128128
}
129129
};

0 commit comments

Comments
 (0)