Merge branch 'yshui:next' into next

Author: pijulius

man/picom.1.adoc

@@ -185,7 +185,7 @@ OPTIONS
 	Blur background of windows when the window frame is not opaque.  Implies *--blur-background*. Bad in performance, with driver-dependent behavior. The name may change.
 
 *--blur-background-fixed*::
-	Use fixed blur strength rather than adjusting according to window opacity.
+	Use fixed blur strength for a window during fading. This only applies to the *--fading* option, and will be a no-op if animation scripts are used.
 
 *--blur-kern* _MATRIX_::
 	Specify the blur convolution kernel, with the following format:

src/backend/gl/egl.c

@@ -154,7 +154,7 @@ static backend_t *egl_init(session_t *ps, xcb_window_t target) {
 	eglext_init(gd->display);
 	init_backend_base(&gd->gl.base, ps);
 	gd->gl.base.ops = egl_ops;
-	if (!eglext.has_EGL_KHR_image_pixmap) {
+	if (!eglext.has_KHR_image_pixmap) {
 		log_error("EGL_KHR_image_pixmap not available.");
 		goto end;
 	}
@@ -190,9 +190,14 @@ static backend_t *egl_init(session_t *ps, xcb_window_t target) {
 		goto end;
 	}
 
-	gd->ctx = eglCreateContext(gd->display, config, NULL, NULL);
+	gd->ctx = eglCreateContext(
+	    gd->display, config, NULL,
+	    (EGLint[]){EGL_CONTEXT_MAJOR_VERSION, 3, EGL_CONTEXT_MINOR_VERSION, 3,
+	               EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+	               EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY,
+	               EGL_LOSE_CONTEXT_ON_RESET, EGL_NONE});
 	if (gd->ctx == EGL_NO_CONTEXT) {
-		log_error("Failed to get EGL context.");
+		log_error("Failed to get EGL context: %#x", eglGetError());
 		goto end;
 	}
 
@@ -292,7 +297,7 @@ static bool egl_present(backend_t *base) {
 }
 
 static int egl_buffer_age(backend_t *base) {
-	if (!eglext.has_EGL_EXT_buffer_age) {
+	if (!eglext.has_EXT_buffer_age) {
 		return -1;
 	}
 
@@ -309,9 +314,11 @@ static void egl_diagnostics(backend_t *base) {
 	auto egl_vendor = eglQueryString(gd->display, EGL_VENDOR);
 	printf("* Driver vendors:\n");
 	printf(" * EGL: %s\n", egl_vendor);
-	if (eglext.has_EGL_MESA_query_driver) {
+#ifdef EGL_MESA_query_driver
+	if (eglext.has_MESA_query_driver) {
 		printf(" * EGL driver: %s\n", eglGetDisplayDriverName(gd->display));
 	}
+#endif
 	printf(" * GL: %s\n", glGetString(GL_VENDOR));
 
 	auto gl_renderer = (const char *)glGetString(GL_RENDERER);
@@ -334,7 +341,7 @@ static void egl_diagnostics(backend_t *base) {
 }
 
 static int egl_max_buffer_age(backend_t *base attr_unused) {
-	if (!eglext.has_EGL_EXT_buffer_age) {
+	if (!eglext.has_EXT_buffer_age) {
 		return 0;
 	}
 
@@ -390,17 +397,15 @@ void eglext_init(EGLDisplay dpy) {
 		return;
 	}
 	eglext.initialized = true;
-#define check_ext(name)                                                                  \
-	eglext.has_##name = epoxy_has_egl_extension(dpy, #name);                         \
-	log_info("Extension " #name " - %s", eglext.has_##name ? "present" : "absent")
+#define X(name)                                                                          \
+	eglext.has_##name = epoxy_has_egl_extension(dpy, "EGL_" #name);                  \
+	log_info("EGL extension " #name " - %s", eglext.has_##name ? "present" : "absent");
 
-	check_ext(EGL_EXT_buffer_age);
-	check_ext(EGL_EXT_create_context_robustness);
-	check_ext(EGL_KHR_image_pixmap);
+	EGL_EXTS;
 #ifdef EGL_MESA_query_driver
-	check_ext(EGL_MESA_query_driver);
+	X(MESA_query_driver);
 #endif
-#undef check_ext
+#undef X
 }
 
 BACKEND_ENTRYPOINT(egl_register) {

src/backend/gl/egl.h

@@ -7,12 +7,20 @@
 #include <xcb/render.h>
 #include <xcb/xcb.h>
 
+#define EGL_EXTS                                                                         \
+	X(EXT_buffer_age)                                                                \
+	X(EXT_create_context_robustness)                                                 \
+	X(KHR_image_pixmap)
+
 struct eglext_info {
 	bool initialized;
-	bool has_EGL_MESA_query_driver;
-	bool has_EGL_EXT_buffer_age;
-	bool has_EGL_EXT_create_context_robustness;
-	bool has_EGL_KHR_image_pixmap;
+
+#ifdef EGL_MESA_query_driver
+	bool has_MESA_query_driver;
+#endif
+#define X(x) bool has_##x;
+	EGL_EXTS
+#undef X
 };
 
 extern struct eglext_info eglext;

src/backend/gl/glx.c

@@ -203,13 +203,13 @@ static void *glx_decouple_user_data(backend_t *base attr_unused, void *ud attr_u
 
 static bool glx_set_swap_interval(int interval, Display *dpy, GLXDrawable drawable) {
 	bool vsync_enabled = false;
-	if (glxext.has_GLX_MESA_swap_control) {
+	if (glxext.has_MESA_swap_control) {
 		vsync_enabled = (glXSwapIntervalMESA((uint)interval) == 0);
 	}
-	if (!vsync_enabled && glxext.has_GLX_SGI_swap_control) {
+	if (!vsync_enabled && glxext.has_SGI_swap_control) {
 		vsync_enabled = (glXSwapIntervalSGI(interval) == 0);
 	}
-	if (!vsync_enabled && glxext.has_GLX_EXT_swap_control) {
+	if (!vsync_enabled && glxext.has_EXT_swap_control) {
 		// glXSwapIntervalEXT doesn't return if it's successful
 		glXSwapIntervalEXT(dpy, drawable, interval);
 		vsync_enabled = true;
@@ -264,12 +264,12 @@ static backend_t *glx_init(session_t *ps, xcb_window_t target) {
 		goto end;
 	}
 
-	if (!glxext.has_GLX_EXT_texture_from_pixmap) {
+	if (!glxext.has_EXT_texture_from_pixmap) {
 		log_error("GLX_EXT_texture_from_pixmap is not supported by your driver");
 		goto end;
 	}
 
-	if (!glxext.has_GLX_ARB_create_context) {
+	if (!glxext.has_ARB_create_context) {
 		log_error("GLX_ARB_create_context is not supported by your driver");
 		goto end;
 	}
@@ -295,7 +295,7 @@ static backend_t *glx_init(session_t *ps, xcb_window_t target) {
 		                          0,
 		                          0,
 		                          0};
-		if (glxext.has_GLX_ARB_create_context_robustness) {
+		if (glxext.has_ARB_create_context_robustness) {
 			attributes[6] = GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB;
 			attributes[7] = GLX_LOSE_CONTEXT_ON_RESET_ARB;
 		}
@@ -456,7 +456,7 @@ static bool glx_present(backend_t *base) {
 }
 
 static int glx_buffer_age(backend_t *base) {
-	if (!glxext.has_GLX_EXT_buffer_age) {
+	if (!glxext.has_EXT_buffer_age) {
 		return -1;
 	}
 
@@ -486,7 +486,7 @@ static void glx_diagnostics(backend_t *base) {
 	}
 
 #ifdef GLX_MESA_query_renderer
-	if (glxext.has_GLX_MESA_query_renderer) {
+	if (glxext.has_MESA_query_renderer) {
 		unsigned int accelerated = 0;
 		glXQueryCurrentRendererIntegerMESA(GLX_RENDERER_ACCELERATED_MESA, &accelerated);
 		printf("* Accelerated: %d\n", accelerated);
@@ -557,23 +557,15 @@ void glxext_init(Display *dpy, int screen) {
 		return;
 	}
 	glxext.initialized = true;
-#define check_ext(name)                                                                  \
-	glxext.has_##name = epoxy_has_glx_extension(dpy, screen, #name);                 \
-	log_info("Extension " #name " - %s", glxext.has_##name ? "present" : "absent")
-
-	check_ext(GLX_SGI_video_sync);
-	check_ext(GLX_SGI_swap_control);
-	check_ext(GLX_OML_sync_control);
-	check_ext(GLX_MESA_swap_control);
-	check_ext(GLX_EXT_swap_control);
-	check_ext(GLX_EXT_texture_from_pixmap);
-	check_ext(GLX_ARB_create_context);
-	check_ext(GLX_EXT_buffer_age);
-	check_ext(GLX_ARB_create_context_robustness);
+#define X(name)                                                                          \
+	glxext.has_##name = epoxy_has_glx_extension(dpy, screen, "GLX_" #name);          \
+	log_info("GLX extension " #name " - %s", glxext.has_##name ? "present" : "absent");
+
+	GLX_EXTS;
 #ifdef GLX_MESA_query_renderer
-	check_ext(GLX_MESA_query_renderer);
+	X(MESA_query_renderer);
 #endif
-#undef check_ext
+#undef X
 }
 
 BACKEND_ENTRYPOINT(glx_register) {

src/backend/gl/glx.h

@@ -20,18 +20,25 @@ struct glx_fbconfig_info {
 bool glx_find_fbconfig(struct x_connection *c, struct xvisual_info m,
                        struct glx_fbconfig_info *info);
 
+#define GLX_EXTS                                                                         \
+	X(SGI_video_sync)                                                                \
+	X(SGI_swap_control)                                                              \
+	X(OML_sync_control)                                                              \
+	X(MESA_swap_control)                                                             \
+	X(EXT_swap_control)                                                              \
+	X(EXT_texture_from_pixmap)                                                       \
+	X(ARB_create_context)                                                            \
+	X(EXT_buffer_age)                                                                \
+	X(ARB_create_context_robustness)
+
 struct glxext_info {
 	bool initialized;
-	bool has_GLX_SGI_video_sync;
-	bool has_GLX_SGI_swap_control;
-	bool has_GLX_OML_sync_control;
-	bool has_GLX_MESA_swap_control;
-	bool has_GLX_EXT_swap_control;
-	bool has_GLX_EXT_texture_from_pixmap;
-	bool has_GLX_ARB_create_context;
-	bool has_GLX_EXT_buffer_age;
-	bool has_GLX_MESA_query_renderer;
-	bool has_GLX_ARB_create_context_robustness;
+#define X(name) bool has_##name;
+	GLX_EXTS
+#undef X
+#ifdef GLX_MESA_query_renderer
+	bool has_MESA_query_renderer;
+#endif
 };
 
 extern struct glxext_info glxext;