From 2beb68007e707e52711200d9607f7d392bec21cd Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 3 Oct 2018 10:36:33 +0200 Subject: output: make gamma size a size_t and gamma table const --- include/backend/drm/iface.h | 8 ++++---- include/wlr/interfaces/wlr_output.h | 6 +++--- include/wlr/types/wlr_output.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index ef0e7bf8..5308b136 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -28,11 +28,11 @@ struct wlr_drm_interface { struct wlr_drm_crtc *crtc, int x, int y); // Set the gamma lut on crtc bool (*crtc_set_gamma)(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc, uint16_t *r, uint16_t *g, uint16_t *b, - uint32_t size); + struct wlr_drm_crtc *crtc, size_t size, + uint16_t *r, uint16_t *g, uint16_t *b); // Get the gamma lut size of a crtc - uint32_t (*crtc_get_gamma_size)(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc); + size_t (*crtc_get_gamma_size)(struct wlr_drm_backend *drm, + struct wlr_drm_crtc *crtc); }; extern const struct wlr_drm_interface atomic_iface; diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 4cbf0d67..bfb3bc9d 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -28,9 +28,9 @@ struct wlr_output_impl { void (*destroy)(struct wlr_output *output); bool (*make_current)(struct wlr_output *output, int *buffer_age); bool (*swap_buffers)(struct wlr_output *output, pixman_region32_t *damage); - bool (*set_gamma)(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); + bool (*set_gamma)(struct wlr_output *output, size_t size, + const uint16_t *r, const uint16_t *g, const uint16_t *b); + size_t (*get_gamma_size)(struct wlr_output *output); bool (*export_dmabuf)(struct wlr_output *output, struct wlr_dmabuf_attributes *attribs); }; diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index ecd4f759..9ede7ab7 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -182,7 +182,7 @@ void wlr_output_schedule_frame(struct wlr_output *output); /** * Returns the maximum length of each gamma ramp, or 0 if unsupported. */ -uint32_t wlr_output_get_gamma_size(struct wlr_output *output); +size_t wlr_output_get_gamma_size(struct wlr_output *output); /** * Sets the gamma table for this output. `r`, `g` and `b` are gamma ramps for * red, green and blue. `size` is the length of the ramps and must not exceed @@ -190,8 +190,8 @@ uint32_t wlr_output_get_gamma_size(struct wlr_output *output); * * Providing zero-sized ramps resets the gamma table. */ -bool wlr_output_set_gamma(struct wlr_output *output, - uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); +bool wlr_output_set_gamma(struct wlr_output *output, size_t size, + const uint16_t *r, const uint16_t *g, const uint16_t *b); bool wlr_output_export_dmabuf(struct wlr_output *output, struct wlr_dmabuf_attributes *attribs); void wlr_output_set_fullscreen_surface(struct wlr_output *output, -- cgit v1.2.3