From 7894fca22498f79f73b8f3c5853dd22a1727cd1c Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 15 Mar 2018 21:26:45 +0100 Subject: [PATCH] matrix: rename wlr_matrix_texture to wlr_matrix_projection --- backend/drm/drm.c | 4 ++-- include/wlr/types/wlr_matrix.h | 4 +--- types/wlr_matrix.c | 2 +- types/wlr_output.c | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 0447d865..fd436659 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -587,8 +587,8 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output, enum wl_output_transform transform = wlr_output_transform_compose( wlr_output_transform_invert(output->transform), WL_OUTPUT_TRANSFORM_FLIPPED_180); - wlr_matrix_texture(plane->matrix, plane->surf.width, plane->surf.height, - transform); + wlr_matrix_projection(plane->matrix, plane->surf.width, + plane->surf.height, transform); plane->wlr_tex = wlr_render_texture_create(plane->surf.renderer->wlr_rend); diff --git a/include/wlr/types/wlr_matrix.h b/include/wlr/types/wlr_matrix.h index 5255980a..fd060d11 100644 --- a/include/wlr/types/wlr_matrix.h +++ b/include/wlr/types/wlr_matrix.h @@ -1,7 +1,6 @@ #ifndef WLR_TYPES_WLR_MATRIX_H #define WLR_TYPES_WLR_MATRIX_H -#include #include #include @@ -13,8 +12,7 @@ void wlr_matrix_multiply(float mat[static 9], const float a[static 9], const float b[static 9]); void wlr_matrix_transform(float mat[static 9], enum wl_output_transform transform); - -void wlr_matrix_texture(float mat[static 9], int32_t width, int32_t height, +void wlr_matrix_projection(float mat[static 9], int width, int height, enum wl_output_transform transform); void wlr_matrix_project_box(float mat[static 9], const struct wlr_box *box, enum wl_output_transform transform, float rotation, diff --git a/types/wlr_matrix.c b/types/wlr_matrix.c index 85a294d9..c5fa1340 100644 --- a/types/wlr_matrix.c +++ b/types/wlr_matrix.c @@ -109,7 +109,7 @@ void wlr_matrix_transform(float mat[static 9], } // Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied -void wlr_matrix_texture(float mat[static 9], int32_t width, int32_t height, +void wlr_matrix_projection(float mat[static 9], int width, int height, enum wl_output_transform transform) { memset(mat, 0, sizeof(*mat) * 9); diff --git a/types/wlr_output.c b/types/wlr_output.c index 9a0edd44..9575f071 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -139,8 +139,8 @@ void wlr_output_update_enabled(struct wlr_output *output, bool enabled) { } static void wlr_output_update_matrix(struct wlr_output *output) { - wlr_matrix_texture(output->transform_matrix, output->width, output->height, - output->transform); + wlr_matrix_projection(output->transform_matrix, output->width, + output->height, output->transform); } void wlr_output_enable(struct wlr_output *output, bool enable) {