diff options
| author | emersion <contact@emersion.fr> | 2018-01-24 14:48:01 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-01-24 14:48:01 +0100 |
| commit | 6281deb90fa6a97835d5045a8be610556ab588fe (patch) | |
| tree | b29d32c44a9a035fbf70e4cdb3dc964a4d3f1507 /include/wlr | |
| parent | 4d282c859099321b1e799a2ab344480f186359ef (diff) | |
| parent | 7a2e9a17bae919088f4265961ad8d00fece7b870 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/render/matrix.h | 4 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 0b35aad3..a333bf0f 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,8 @@ 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_project_box(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation, float + (*projection)[16]); #endif diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 91429123..823c3b5e 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -93,6 +93,8 @@ struct wlr_output { struct wlr_surface; void wlr_output_enable(struct wlr_output *output, bool enable); +void wlr_output_create_global(struct wlr_output *output); +void wlr_output_destroy_global(struct wlr_output *output); bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width, |