Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion src/mag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
};
Expand Down
5 changes: 2 additions & 3 deletions src/showrepaint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<wf::texture_t> 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);
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/window-zoom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class simple_node_render_instance_t : public transformer_render_instance_t<trans
{
auto src_tex = get_texture(1.0);
auto scaled_geometry = get_scaled_geometry();
src_tex.filter_mode = nearest_filtering ? WLR_SCALE_FILTER_NEAREST : WLR_SCALE_FILTER_BILINEAR;
src_tex->set_filter_mode(nearest_filtering ? WLR_SCALE_FILTER_NEAREST : WLR_SCALE_FILTER_BILINEAR);
data.pass->add_texture(src_tex, data.target, scaled_geometry, data.damage);
}
};
Expand Down
Loading