diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:28:04 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:57:36 -0400 |
| commit | 1dbe31493708790f6fafb4c9da8d24cbb3fa07b9 (patch) | |
| tree | 42e7dbbe8b77403aa00983befc256f7b7a7742ca /include/wlr/interfaces | |
| parent | 6fcac087fe1d7b7fa3cd0628a6b7818d26222678 (diff) | |
| parent | 1b7918f50e8b22cbaba978c695b7cc5921125c55 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'include/wlr/interfaces')
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index b7927569..d365e8f5 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -1,8 +1,9 @@ #ifndef WLR_INTERFACES_WLR_OUTPUT_H #define WLR_INTERFACES_WLR_OUTPUT_H -#include <wlr/types/wlr_output.h> #include <stdbool.h> +#include <wlr/types/wlr_output.h> +#include <wlr/backend.h> struct wlr_output_impl { void (*enable)(struct wlr_output *output, bool enable); @@ -17,14 +18,17 @@ struct wlr_output_impl { void (*make_current)(struct wlr_output *output); void (*swap_buffers)(struct wlr_output *output); void (*set_gamma)(struct wlr_output *output, - uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); - uint16_t (*get_gamma_size)(struct wlr_output *output); + uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); + uint32_t (*get_gamma_size)(struct wlr_output *output); }; -void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl); +void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, + const struct wlr_output_impl *impl); void wlr_output_free(struct wlr_output *output); -void wlr_output_update_matrix(struct wlr_output *output); -struct wl_global *wlr_output_create_global( - struct wlr_output *wlr_output, struct wl_display *display); +void wlr_output_update_size(struct wlr_output *output, int32_t width, + int32_t height); +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); #endif |