diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-01-21 15:53:29 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-21 15:53:42 -0500 |
| commit | d13114520acef63f9293ff313b8a549bc81be30c (patch) | |
| tree | 8c4d3be30d295472f3b858f6316bcb9089330750 /include | |
| parent | 7474f005917fbb98cad08e8078c1da0c27742174 (diff) | |
move matrix model code to matrix.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/wlr/render/matrix.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output.h | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 0b35aad3..dbd06c8d 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -2,6 +2,7 @@ #define WLR_RENDER_MATRIX_H #include <stdint.h> +#include <wlr/types/wlr_box.h> void wlr_matrix_identity(float (*output)[16]); void wlr_matrix_translate(float (*output)[16], float x, float y, float z); @@ -14,5 +15,7 @@ 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); +void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation); #endif diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 4c59d98b..71463cb5 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -136,11 +136,4 @@ enum wl_output_transform wlr_output_transform_invert( enum wl_output_transform wlr_output_transform_compose( enum wl_output_transform tr_a, enum wl_output_transform tr_b); -/** - * Get a matrix suitable for rendering a box on the output. - */ -void wlr_output_get_box_matrix(struct wlr_output *output, int ox, int oy, - int width, int height, enum wl_output_transform transform, - float rotation, float (*mat)[16]); - #endif |