feat: remove enum corner_location

Author: the-eater

examples/scene-graph.c

@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <getopt.h>
 #include <scenefx/render/fx_renderer/fx_renderer.h>
-#include <scenefx/types/fx/corner_location.h>
 #include <scenefx/types/wlr_scene.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -145,7 +144,7 @@ static void server_handle_new_surface(struct wl_listener *listener,
 	surface->scene_surface =
 		wlr_scene_surface_create(&server->scene->tree, wlr_surface);
 	wlr_scene_buffer_set_corner_radius(
-			surface->scene_surface->buffer, corner_radius, CORNER_LOCATION_ALL);
+			surface->scene_surface->buffer, corner_radius);
 
 	wlr_scene_node_set_position(&surface->scene_surface->buffer->node,
 			pos + border_width, pos + border_width);

include/render/fx_renderer/shaders.h

@@ -3,6 +3,7 @@
 
 #include <GLES2/gl2.h>
 #include <stdbool.h>
+#include "scenefx/types/fx/clipped_region.h"
 
 struct fx_renderer;
 
@@ -20,6 +21,27 @@ enum fx_tex_shader_source {
 	SHADER_SOURCE_TEXTURE_EXTERNAL = 3,
 };
 
+struct shader_corner_radii {
+	GLint top_left;
+	GLint top_right;
+	GLint bottom_left;
+	GLint bottom_right;
+};
+
+void uniform_corner_radii_set_location(
+	struct shader_corner_radii *corners,
+	GLuint program,
+	const char *top_left,
+	const char *top_right,
+	const char *bottom_left,
+	const char *bottom_right
+);
+
+void uniform_corner_radii_set(
+	struct shader_corner_radii *uniform,
+	struct fx_corner_fradii *corners
+);
+
 struct quad_shader {
 	GLuint program;
 	GLint proj;
@@ -28,10 +50,7 @@ struct quad_shader {
 
 	GLint clip_size;
 	GLint clip_position;
-	GLint clip_radius_top_left;
-	GLint clip_radius_top_right;
-	GLint clip_radius_bottom_left;
-	GLint clip_radius_bottom_right;
+	struct shader_corner_radii clip_radius;
 };
 
 bool link_quad_program(struct quad_shader *shader, GLint client_version);
@@ -62,17 +81,11 @@ struct quad_round_shader {
 	GLint size;
 	GLint position;
 
-	GLint radius_top_left;
-	GLint radius_top_right;
-	GLint radius_bottom_left;
-	GLint radius_bottom_right;
+	struct shader_corner_radii radius;
 
 	GLint clip_size;
 	GLint clip_position;
-	GLint clip_radius_top_left;
-	GLint clip_radius_top_right;
-	GLint clip_radius_bottom_left;
-	GLint clip_radius_bottom_right;
+	struct shader_corner_radii clip_radius;
 };
 
 bool link_quad_round_program(struct quad_round_shader *shader, GLint client_version);
@@ -94,10 +107,7 @@ struct quad_grad_round_shader {
 	GLint count;
 	GLint blend;
 
-	GLint radius_top_left;
-	GLint radius_top_right;
-	GLint radius_bottom_left;
-	GLint radius_bottom_right;
+	struct shader_corner_radii radius;
 
 	int max_len;
 };
@@ -113,19 +123,13 @@ struct tex_shader {
 	GLint pos_attrib;
 	GLint size;
 	GLint position;
-	GLint radius_top_left;
-	GLint radius_top_right;
-	GLint radius_bottom_left;
-	GLint radius_bottom_right;
+	struct shader_corner_radii radius;
 
 	GLint discard_transparent;
 
 	GLint clip_size;
 	GLint clip_position;
-	GLint clip_radius_top_left;
-	GLint clip_radius_top_right;
-	GLint clip_radius_bottom_left;
-	GLint clip_radius_bottom_right;
+	struct shader_corner_radii clip_radius;
 };
 
 bool link_tex_program(struct tex_shader *shader, GLint client_version, enum fx_tex_shader_source source);
@@ -142,10 +146,7 @@ struct box_shadow_shader {
 
 	GLint clip_position;
 	GLint clip_size;
-	GLint clip_radius_top_left;
-	GLint clip_radius_top_right;
-	GLint clip_radius_bottom_left;
-	GLint clip_radius_bottom_right;
+	struct shader_corner_radii clip_radius;
 };
 
 bool link_box_shadow_program(struct box_shadow_shader *shader, GLint client_version);

include/scenefx/render/pass.h

@@ -8,7 +8,6 @@
 
 #include "render/egl.h"
 #include "scenefx/types/fx/clipped_region.h"
-#include "scenefx/types/fx/corner_location.h"
 
 struct fx_gles_render_pass {
 	struct wlr_render_pass base;
@@ -55,15 +54,14 @@ struct fx_gradient {
 struct fx_render_texture_options {
 	struct wlr_render_texture_options base;
 	const struct wlr_box *clip_box; // Used to clip csd. Ignored if NULL
-	enum corner_location corners;
-	int corner_radius;
+	struct fx_corner_fradii corners;
 	bool discard_transparent;
-	struct clipped_region clipped_region;
+	struct clipped_fregion clipped_region;
 };
 
 struct fx_render_rect_options {
 	struct wlr_render_rect_options base;
-	struct clipped_region clipped_region;
+	struct clipped_fregion clipped_region;
 };
 
 struct fx_render_rect_grad_options {
@@ -73,21 +71,19 @@ struct fx_render_rect_grad_options {
 
 struct fx_render_rounded_rect_options {
 	struct wlr_render_rect_options base;
-	int corner_radius;
-	enum corner_location corners;
-	struct clipped_region clipped_region;
+	struct fx_corner_fradii corners;
+	struct clipped_fregion clipped_region;
 };
 
 struct fx_render_rounded_rect_grad_options {
 	struct wlr_render_rect_options base;
 	struct fx_gradient gradient;
-	int corner_radius;
-	enum corner_location corners;
+	struct fx_corner_fradii corners;
 };
 
 struct fx_render_box_shadow_options {
 	struct wlr_box box;
-	struct clipped_region clipped_region;
+	struct clipped_fregion clipped_region;
 	/* Clip region, leave NULL to disable clipping */
 	const pixman_region32_t *clip;
 
@@ -104,9 +100,8 @@ struct fx_render_blur_pass_options {
 	bool use_optimized_blur;
 	bool ignore_transparent;
 	float blur_strength;
-	int corner_radius;
-	enum corner_location corners;
-	struct clipped_region clipped_region;
+	struct fx_corner_radii corners;
+	struct clipped_fregion clipped_region;
 };
 
 /**

include/scenefx/types/fx/clipped_region.h

@@ -3,12 +3,91 @@
 
 #include <wlr/util/box.h>
 
-#include "scenefx/types/fx/corner_location.h"
+// uint16_t is a reasonable enough range for corner radius
+// and makes it 8 bytes wide, making it cheap with optimisations
+// Note: layout is on purpose to be clockwise
+struct fx_corner_radii {
+	uint16_t top_left;
+	uint16_t top_right;
+	uint16_t bottom_right;
+	uint16_t bottom_left;
+};
+
+struct fx_corner_fradii {
+	float top_left;
+	float top_right;
+	float bottom_right;
+	float bottom_left;
+};
+
+#define CORNER_RADIUS_MAX (UINT16_MAX)
+
+static __always_inline uint16_t corner_radius_clamp(int radius) {
+	if (radius <= 0) {
+		return 0;
+	}
+
+	if (radius > CORNER_RADIUS_MAX) {
+		return CORNER_RADIUS_MAX;
+	}
+
+	return radius;
+}
+
+static __always_inline struct fx_corner_radii corner_radii_new(int top_left, int top_right, int bottom_right, int bottom_left) {
+	return (struct fx_corner_radii) {
+		corner_radius_clamp(top_left),
+		corner_radius_clamp(top_right),
+		corner_radius_clamp(bottom_right),
+		corner_radius_clamp(bottom_left),
+	};
+}
+
+static __always_inline struct fx_corner_radii corner_radii_all(int radius) {
+	return corner_radii_new(radius, radius, radius, radius);
+}
+
+static __always_inline struct fx_corner_radii corner_radii_none() {
+	return corner_radii_all(0);
+}
+
+static __always_inline struct fx_corner_radii corner_radii_top(int radius) {
+	return corner_radii_new(radius, radius, 0, 0);
+}
+
+static __always_inline struct fx_corner_radii corner_radii_bottom(int radius) {
+	return corner_radii_new(0, 0, radius, radius);
+}
+
+static __always_inline struct fx_corner_radii corner_radii_left(int radius) {
+	return corner_radii_new(radius, 0, 0, radius);
+}
+
+static __always_inline struct fx_corner_radii corner_radii_right(int radius) {
+	return corner_radii_new(0, radius, radius, 0);
+}
+
+struct fx_corner_radii fx_corner_radii_extend(struct fx_corner_radii corners, int extend);
+
+void fx_corner_radii_transform(enum wl_output_transform transform,
+		struct fx_corner_radii *corners);
+
+struct fx_corner_fradii fx_corner_radii_scale(struct fx_corner_radii, float scale);
+
+bool fx_corner_radii_eq(struct fx_corner_radii lhs, struct fx_corner_radii rhs);
+
+bool fx_corner_radii_is_empty(const struct fx_corner_radii* corners);
+
+bool fx_corner_fradii_is_empty(const struct fx_corner_fradii* corners);
 
 struct clipped_region {
 	struct wlr_box area;
-	int corner_radius;
-	enum corner_location corners;
+	struct fx_corner_radii corners;
+};
+
+struct clipped_fregion {
+	struct wlr_box area;
+	struct fx_corner_fradii corners;
 };
 
 struct clipped_region clipped_region_get_default(void);