diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-14 14:43:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 14:43:04 -0500 |
| commit | 23fb663ea4eaff436d9bfab7f74cdd298fac44c5 (patch) | |
| tree | f84e20d4af2a4111b0026679e853f6f55f9ddb4f /include/wlr | |
| parent | 46ac8e1243d3d32c656b09e641f8e9732035f635 (diff) | |
| parent | 466e86b7b2cbefa55ad5b85a97ee8257c24cb81b (diff) | |
Merge pull request #453 from emersion/surface-transform
Add surface transforms support
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 4 | ||||
| -rw-r--r-- | include/wlr/render/matrix.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_box.h | 4 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index dc2a867b..1cfe7568 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -34,8 +34,4 @@ struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output, struct wl_display *display); void wlr_output_destroy_global(struct wlr_output *wlr_output); -void wlr_output_transform_apply_to_box(enum wl_output_transform transform, - struct wlr_box *box, struct wlr_box *dest); -enum wl_output_transform wlr_output_transform_invert(enum wl_output_transform); - #endif diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 177af4b3..0b35aad3 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -10,6 +10,8 @@ void wlr_matrix_rotate(float (*output)[16], float radians); void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)[16]); enum wl_output_transform; +void wlr_matrix_transform(float mat[static 16], + enum wl_output_transform transform); void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height, enum wl_output_transform transform); diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h index 5b8b00c9..5290ada5 100644 --- a/include/wlr/types/wlr_box.h +++ b/include/wlr/types/wlr_box.h @@ -18,4 +18,8 @@ bool wlr_box_contains_point(struct wlr_box *box, double x, double y); bool wlr_box_empty(struct wlr_box *box); +enum wl_output_transform; +void wlr_box_transform(struct wlr_box *box, enum wl_output_transform transform, + struct wlr_box *dest); + #endif diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index cbedf240..39aad718 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -117,4 +117,6 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, double x, double y); void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor); +enum wl_output_transform wlr_output_transform_invert(enum wl_output_transform); + #endif |