color mgmt: bug fixes

include/render/gles2.h

@@ -10,6 +10,7 @@
 #include <wlr/render/egl.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render/interface.h>
+#include <wlr/render/color.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/render/wlr_texture.h>
 #include <wlr/util/log.h>
@@ -81,6 +82,7 @@ struct wlr_gles2_renderer {
 	} shaders;
 
 	uint32_t viewport_width, viewport_height;
+	struct wlr_color_config *color;
 };
 
 struct wlr_gles2_texture {

include/wlr/render/interface.h

@@ -32,6 +32,7 @@ struct wlr_renderer_impl {
 	void (*end)(struct wlr_renderer *renderer);
 	void (*clear)(struct wlr_renderer *renderer, const float color[static 4]);
 	void (*scissor)(struct wlr_renderer *renderer, struct wlr_box *box);
+	void (*color_config)(struct wlr_renderer *renderer, struct wlr_color_config *color);
 	bool (*render_subtexture_with_matrix)(struct wlr_renderer *renderer,
 		struct wlr_texture *texture, const struct wlr_fbox *box,
 		const float matrix[static 9], float alpha);

include/wlr/render/wlr_renderer.h

@@ -24,7 +24,6 @@ struct wlr_drm_format_set;
 
 struct wlr_renderer {
 	const struct wlr_renderer_impl *impl;
-	struct wlr_color_config *color;
 
 	bool rendering;
 
@@ -45,6 +44,10 @@ void wlr_renderer_clear(struct wlr_renderer *r, const float color[static 4]);
  * box.
  */
 void wlr_renderer_scissor(struct wlr_renderer *r, struct wlr_box *box);
+/**
+ * Define an output color config for future renderering functions.
+ */
+void wlr_renderer_color_config(struct wlr_renderer *r, struct wlr_color_config *color);
 /**
  * Renders the requested texture.
  */

include/wlr/types/wlr_output.h

@@ -185,6 +185,8 @@ struct wlr_output {
 
 	struct wl_listener display_destroy;
 
+	struct wlr_color_config *color;
+
 	void *data;
 };