diff options
| author | emersion <contact@emersion.fr> | 2017-12-14 23:59:04 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-12-14 23:59:04 +0100 |
| commit | 6b42bfad18f7bcb08ef031c699159d40ff6ac2a0 (patch) | |
| tree | c8c24d5cf48c8a7487499d37da92e1bf7da419b9 /include/wlr/render | |
| parent | b884025558e750268a06818dc63bc46716c75843 (diff) | |
| parent | 23fb663ea4eaff436d9bfab7f74cdd298fac44c5 (diff) | |
Merge branch 'master' into xwm-selection
Diffstat (limited to 'include/wlr/render')
| -rw-r--r-- | include/wlr/render/egl.h | 3 | ||||
| -rw-r--r-- | include/wlr/render/matrix.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 9ab4d9ce..67a81f37 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -4,6 +4,7 @@ #include <EGL/egl.h> #include <EGL/eglext.h> #include <stdbool.h> +#include <wayland-server.h> struct wlr_egl { EGLDisplay display; @@ -27,7 +28,7 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void * Frees all related egl resources, makes the context not-current and * unbinds a bound wayland display. */ -void wlr_egl_free(struct wlr_egl *egl); +void wlr_egl_finish(struct wlr_egl *egl); /** * Binds the given display to the egl instance. 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); |