aboutsummaryrefslogtreecommitdiff
path: root/rootston/output.c
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-15 11:10:56 +0100
committeremersion <contact@emersion.fr>2018-03-15 11:10:56 +0100
commitd26b67cb06509fb39d9ed473a5d27b1f241ff635 (patch)
tree704c2732b6a3ce247dce8510eed9e629a35ce828 /rootston/output.c
parentb6a3f240c7621d1ebb5774fcdf7784d976500ee1 (diff)
matrix: unify API, don't use array pointers
Diffstat (limited to 'rootston/output.c')
-rw-r--r--rootston/output.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/rootston/output.c b/rootston/output.c
index bdf025ad..47236720 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -290,14 +290,14 @@ static void render_surface(struct wlr_surface *surface, double lx, double ly,
float matrix[16];
enum wl_output_transform transform =
wlr_output_transform_invert(surface->current->transform);
- wlr_matrix_project_box(&matrix, &box, transform, rotation,
- &output->wlr_output->transform_matrix);
+ wlr_matrix_project_box(matrix, &box, transform, rotation,
+ output->wlr_output->transform_matrix);
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(output, &rects[i]);
- wlr_render_with_matrix(renderer, surface->texture, &matrix, data->alpha);
+ wlr_render_with_matrix(renderer, surface->texture, matrix, data->alpha);
}
damage_finish:
@@ -354,8 +354,8 @@ static void render_decorations(struct roots_view *view,
}
float matrix[16];
- wlr_matrix_project_box(&matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL,
- view->rotation, &output->wlr_output->transform_matrix);
+ wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL,
+ view->rotation, output->wlr_output->transform_matrix);
float color[] = { 0.2, 0.2, 0.2, view->alpha };
int nrects;
@@ -363,7 +363,7 @@ static void render_decorations(struct roots_view *view,
pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(output, &rects[i]);
- wlr_render_colored_quad(renderer, &color, &matrix);
+ wlr_render_colored_quad(renderer, color, matrix);
}
damage_finish:
@@ -489,7 +489,7 @@ static void render_output(struct roots_output *output) {
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(output, &rects[i]);
- wlr_renderer_clear(renderer, &clear_color);
+ wlr_renderer_clear(renderer, clear_color);
}
// If a view is fullscreen on this output, render it