blur plugin: add some missing features and stuff to truly make a independent working plugin

Author: the-eater

examples/example-blur-plugin.c

@@ -39,7 +39,7 @@ static  char* invert_gles3_src =
 	"	fragColor = texture(tex, inverted_coord);\n"
 	"}\n";
 
-static bool invert_init(int client_version, void** user_data)
+static bool invert_init(int client_version, char *id, void** user_data)
 {
 	struct invert_data* v = malloc(sizeof(struct invert_data));
 	if (!v)
@@ -67,6 +67,8 @@ static void invert_execute(pixman_region32_t* damage, struct wlr_box* box,
                            struct fx_render_blur_pass_options* fx_options,
                            void* data)
 {
+	fx_options->tex_options.base.clip = damage;
+
 	struct fx_render_texture_options* tex_options = &fx_options->tex_options;
 	struct wlr_render_texture_options* options = &tex_options->base;
 	struct fx_texture* texture = fx_get_texture(options->texture);

include/scenefx/render/pass.h

@@ -112,7 +112,8 @@ struct fx_render_blur_pass_options {
 
 struct fx_blur_impl {
 	char *name;
-	bool (*init)(int client_version, void ** data);
+	bool (*init)(int client_version, char *id, void ** data);
+	bool (*supports_optimized_blur)(void *);
 	int (*get_expansion)(struct fx_gles_render_pass *, struct fx_render_blur_pass_options *, void *);
 	bool (*prepare)(pixman_region32_t *damage, struct fx_gles_render_pass *, struct fx_render_blur_pass_options *, void *);
 	void (*execute)(pixman_region32_t *damage, struct wlr_box *box, struct fx_gles_render_pass *, struct fx_render_blur_pass_options *, void *);

render/fx_renderer/fx_blur.c

@@ -98,7 +98,7 @@ bool fx_blur_plugin_link(struct wlr_renderer *renderer, struct fx_blur_plugin_in
 	eglQueryContext(fx_renderer->egl->display, fx_renderer->egl->context,
 		EGL_CONTEXT_CLIENT_VERSION, &client_version);
 
-	bool res = info->blur_impl->init(client_version, &info->user_data);
+	bool res = info->blur_impl->init(client_version, info->id, &info->user_data);
 	if (!res) {
 		return false;
 	}

render/fx_renderer/fx_pass.c

@@ -929,12 +929,12 @@ static struct fx_framebuffer *get_main_buffer_blur(struct fx_gles_render_pass *p
 		struct fx_blur_plugin_info *found = fx_renderer_get_plugin(&renderer->wlr_renderer, fx_options->blur_id);
 		if (found == NULL) {
 			wlr_log(WLR_ERROR, "invalid custom blur given");
-			return NULL;
+			return fx_options->current_buffer;
 		}
 
 		if (!(found->state & BLUR_READY)) {
 			wlr_log(WLR_ERROR, "custom blur %s hasn't been readied for renderer", found->id);
-			return NULL;
+			return fx_options->current_buffer;
 		}
 
 		blur_user_data = found->user_data;
@@ -965,8 +965,8 @@ static struct fx_framebuffer *get_main_buffer_blur(struct fx_gles_render_pass *p
 	// Artifacts with NEAREST filter
 	fx_options->tex_options.base.filter_mode = WLR_SCALE_FILTER_BILINEAR;
 
-	if (blur->prepare != NULL && !blur->prepare(&damage, pass, fx_options, &blur_user_data)) {
-		return NULL;
+	if (blur->prepare != NULL && !blur->prepare(&damage, pass, fx_options, blur_user_data)) {
+		return fx_options->current_buffer;
 	}
 
 	// Render additional blur effects like saturation, noise, contrast, etc...
@@ -1027,7 +1027,15 @@ void fx_render_pass_add_blur(struct fx_gles_render_pass *pass,
 
 	const bool has_strength = fx_options->blur_strength < 1.0;
 	struct fx_framebuffer *buffer = pass->fx_effect_framebuffers->optimized_blur_buffer;
-	if (!buffer || !fx_options->use_optimized_blur || has_strength) {
+	bool use_optimized_blur = buffer && fx_options->use_optimized_blur && !has_strength;
+	if (use_optimized_blur && fx_options->blur_data->id != NULL) {
+		struct fx_blur_plugin_info *info = fx_renderer_get_plugin(&renderer->wlr_renderer, fx_options->blur_data->id);
+		if (info->blur_impl->supports_optimized_blur && !info->blur_impl->supports_optimized_blur(info->user_data)) {
+			use_optimized_blur = false;
+		}
+	}
+
+	if (!use_optimized_blur) {
 		if (!buffer) {
 			wlr_log(WLR_ERROR, "Warning: Failed to use optimized blur");
 		}
@@ -1036,7 +1044,9 @@ void fx_render_pass_add_blur(struct fx_gles_render_pass *pass,
 
 		// Render the blur into its own buffer
 		struct fx_render_blur_pass_options blur_options = *fx_options;
+		blur_options.blur_id = blur_options.blur_data->id;
 		blur_options.tex_options.base.clip = &translucent_region;
+
 		if (fx_options->use_optimized_blur && has_strength
 				// If the optimized blur hasn't been rendered yet
 				&& pass->fx_effect_framebuffers->optimized_no_blur_buffer) {
@@ -1046,7 +1056,6 @@ void fx_render_pass_add_blur(struct fx_gles_render_pass *pass,
 		} else {
 			blur_options.current_buffer = pass->buffer;
 		}
-		blur_options.blur_id = blur_options.blur_data->id;
 		buffer = get_main_buffer_blur(pass, &blur_options);
 		if (!buffer) {
 			goto damage_finish;

types/scene/wlr_scene.c

@@ -2847,6 +2847,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
 
 	if (debug_damage == WLR_SCENE_DEBUG_DAMAGE_RERENDER) {
 		scene_output_damage_whole(scene_output);
+		mark_all_optimized_blur_nodes_dirty(&scene_output->scene->tree.node);
 	}
 
 	struct timespec now;