mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1625 from emersion/matrix-redesign

Browse source 
Update rendering code for wlroots matrix redesign
This commit is contained in:
Drew DeVault 2018-03-18 09:41:50 -04:00 committed by GitHub
commit 9823a7c6c8
Failed to generate hash of commit
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sway/desktop/output.c
View file

@ -3,19 +3,19 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/render.h>
#include <wlr/types/wlr_matrix.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_wl_shell.h>
#include <wlr/render.h>
#include <wlr/render/matrix.h>
#include "log.h" #include "log.h"
#include "sway/container.h" #include "sway/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/layout.h" #include "sway/layout.h"
#include "sway/output.h" #include "sway/output.h"
#include "sway/server.h" #include "sway/server.h"
#include "sway/view.h" #include "sway/view.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
/** /**
* Rotate a child's position relative to a parent. The parent size is (pw, ph), * Rotate a child's position relative to a parent. The parent size is (pw, ph),
@ -59,11 +59,11 @@ static void render_surface(struct wlr_surface *surface,
.x = lx, .y = ly, .x = lx, .y = ly,
.width = render_width, .height = render_height .width = render_width, .height = render_height
}; };
float matrix[16]; float matrix[9];
wlr_matrix_project_box(&matrix, &render_box, wlr_matrix_project_box(matrix, &render_box, surface->current->transform,
surface->current->transform, 0, &wlr_output->transform_matrix); 0, wlr_output->transform_matrix);
wlr_render_with_matrix(server.renderer, surface->texture, wlr_render_texture_with_matrix(server.renderer, surface->texture,
&matrix, 1.0f); // TODO: configurable alpha matrix, 1.0f); // TODO: configurable alpha
wlr_surface_send_frame_done(surface, when); wlr_surface_send_frame_done(surface, when);
} }
@ -183,7 +183,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
struct sway_server *server = soutput->server; struct sway_server *server = soutput->server;
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f}; float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend); struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
wlr_renderer_clear(renderer, &clear_color); wlr_renderer_clear(renderer, clear_color);
int buffer_age = -1; int buffer_age = -1;
wlr_output_make_current(wlr_output, &buffer_age); wlr_output_make_current(wlr_output, &buffer_age);