Merge branch 'wlcore'

4 files changed, 39 insertions, 10 deletions

diff --git a/include/render/gles2.h b/include/render/gles2.h
index bd0106b3..7b835209 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -6,19 +6,38 @@
 #include <GLES2/gl2.h>
 #include <wlr/render.h>
 
+struct pixel_format {
+	uint32_t wl_format;
+	GLint gl_format, gl_type;
+	int depth, bpp;
+	GLuint *shader;
+};
+
 struct wlr_surface_state {
 	struct wlr_surface *wlr_surface;
 	GLuint tex_id;
+	const struct pixel_format *pixel_format;
+};
+
+struct shaders {
+	bool initialized;
+	GLuint rgba, rgbx;
+	GLuint quad;
+	GLuint ellipse;
 };
 
+extern struct shaders shaders;
+
+const struct pixel_format *gl_format_for_wl_format(enum wl_shm_format fmt);
+
 struct wlr_surface *gles2_surface_init();
 
 extern const GLchar quad_vertex_src[];
 extern const GLchar quad_fragment_src[];
 extern const GLchar ellipse_fragment_src[];
 extern const GLchar vertex_src[];
-extern const GLchar fragment_src_RGB[];
-extern const GLchar fragment_src_RGBA[];
+extern const GLchar fragment_src_rgba[];
+extern const GLchar fragment_src_rgbx[];
 
 bool _gles2_flush_errors(const char *file, int line);
 #define gles2_flush_errors(...) \
diff --git a/include/wlr/render.h b/include/wlr/render.h
index 53df01d2..30648a20 100644
--- a/include/wlr/render.h
+++ b/include/wlr/render.h
@@ -39,6 +39,11 @@ void wlr_render_colored_quad(struct wlr_renderer *r,
 void wlr_render_colored_ellipse(struct wlr_renderer *r,
 		const float (*color)[4], const float (*matrix)[16]);
 /**
+ * Returns a list of pixel formats supported by this renderer.
+ */
+const enum wl_shm_format *wlr_renderer_get_formats(
+		struct wlr_renderer *r, size_t *len);
+/**
  * Destroys this wlr_renderer. Surfaces must be destroyed separately.
  */
 void wlr_renderer_destroy(struct wlr_renderer *renderer);
@@ -58,8 +63,9 @@ struct wlr_surface {
  * Attaches a pixel buffer to this surface. The buffer may be discarded after
  * calling this function.
  */
-bool wlr_surface_attach_pixels(struct wlr_surface *surf, uint32_t format,
-		int stride, int width, int height, const unsigned char *pixels);
+bool wlr_surface_attach_pixels(struct wlr_surface *surf,
+		enum wl_shm_format format, int stride, int width, int height,
+		const unsigned char *pixels);
 /**
  * Attaches pixels from a wl_shm_buffer to this surface. The shm buffer may be
  * invalidated after calling this function.
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index a9c86f2c..ed804bb4 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -20,9 +20,11 @@ struct wlr_renderer_impl {
 	bool (*render_with_matrix)(struct wlr_renderer_state *state,
 		struct wlr_surface *surface, const float (*matrix)[16]);
 	void (*render_quad)(struct wlr_renderer_state *state,
-			const float (*color)[4], const float (*matrix)[16]);
+		const float (*color)[4], const float (*matrix)[16]);
 	void (*render_ellipse)(struct wlr_renderer_state *state,
-			const float (*color)[4], const float (*matrix)[16]);
+		const float (*color)[4], const float (*matrix)[16]);
+	const enum wl_shm_format *(*formats)(
+		struct wlr_renderer_state *state, size_t *len);
 	void (*destroy)(struct wlr_renderer_state *state);
 };
 
@@ -30,13 +32,14 @@ struct wlr_renderer *wlr_renderer_init(struct wlr_renderer_state *state,
 		struct wlr_renderer_impl *impl);
 
 struct wlr_surface_impl {
-	bool (*attach_pixels)(struct wlr_surface_state *state, uint32_t format,
-		int stride, int width, int height, const unsigned char *pixels);
+	bool (*attach_pixels)(struct wlr_surface_state *state,
+		enum wl_shm_format format, int stride, int width, int height,
+		const unsigned char *pixels);
 	bool (*attach_shm)(struct wlr_surface_state *state, uint32_t format,
 		struct wl_shm_buffer *shm);
 	// TODO: egl
 	void (*get_matrix)(struct wlr_surface_state *state,
-			float (*matrix)[16], const float (*projection)[16], int x, int y);
+		float (*matrix)[16], const float (*projection)[16], int x, int y);
 	void (*bind)(struct wlr_surface_state *state);
 	void (*destroy)(struct wlr_surface_state *state);
 };
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index da5a7b07..cfc4cc0e 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -19,8 +19,9 @@ struct wlr_output_state;
 struct wlr_output {
 	const struct wlr_output_impl *impl;
 	struct wlr_output_state *state;
+	void *user_data;
 	struct wl_global *wl_global;
-	struct wl_list resource_list;
+	struct wl_list wl_resources;
 
 	uint32_t flags;
 	char name[16];