compositor/screen-share.c

@@ -1165,8 +1165,10 @@ wet_module_init(struct weston_compositor *compositor,
 		int *argc, char *argv[])
 {
 	struct screen_share *ss;
+	struct weston_output *output;
 	struct weston_config *config;
 	struct weston_config_section *section;
+	bool start_on_startup = false;
 
 	ss = zalloc(sizeof *ss);
 	if (ss == NULL)
@@ -1182,5 +1184,12 @@ wet_module_init(struct weston_compositor *compositor,
 	weston_compositor_add_key_binding(compositor, KEY_S,
 				          MODIFIER_CTRL | MODIFIER_ALT,
 					  share_output_binding, ss);
+
+	if (weston_config_section_get_bool(section, "start-on-startup",
+					   &start_on_startup, false) == 0) {
+		wl_list_for_each(output, &compositor->output_list, link)
+			weston_output_share(output, ss->command);
+	}
+
 	return 0;
 }

libweston/renderer-gl/gl-renderer-internal.h

@@ -151,6 +151,7 @@ struct gl_renderer {
 	struct wl_list dmabuf_images;
 	struct wl_list dmabuf_formats;
 
+	bool has_texture_type_2_10_10_10_rev;
 	bool has_gl_texture_rg;
 
 	struct gl_shader *current_shader;

libweston/renderer-gl/gl-renderer.c

@@ -1821,6 +1821,8 @@ gl_format_from_internal(GLenum internal_format)
 		return GL_RED_EXT;
 	case GL_RG8_EXT:
 		return GL_RG_EXT;
+	case GL_RGB10_A2:
+		return GL_RGBA;
 	default:
 		return internal_format;
 	}
@@ -1959,6 +1961,7 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
 	GLenum gl_pixel_type;
 	int pitch;
 	int num_planes;
+	bool using_glesv2 = gr->gl_version < gr_gl_version(3, 0);
 
 	buffer->shm_buffer = shm_buffer;
 	buffer->width = wl_shm_buffer_get_width(shm_buffer);
@@ -1991,6 +1994,28 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
 		gl_pixel_type = GL_UNSIGNED_SHORT_5_6_5;
 		es->is_opaque = true;
 		break;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	case WL_SHM_FORMAT_ABGR2101010:
+		if (!gr->has_texture_type_2_10_10_10_rev) {
+			goto unsupported;
+		}
+		gs->shader_variant = SHADER_VARIANT_RGBA;
+		pitch = wl_shm_buffer_get_stride(shm_buffer) / 4;
+		gl_format[0] = using_glesv2 ? GL_RGBA : GL_RGB10_A2;
+		gl_pixel_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT;
+		es->is_opaque = false;
+		break;
+	case WL_SHM_FORMAT_XBGR2101010:
+		if (!gr->has_texture_type_2_10_10_10_rev) {
+			goto unsupported;
+		}
+		gs->shader_variant = SHADER_VARIANT_RGBX;
+		pitch = wl_shm_buffer_get_stride(shm_buffer) / 4;
+		gl_format[0] = using_glesv2 ? GL_RGBA : GL_RGB10_A2;
+		gl_pixel_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT;
+		es->is_opaque = true;
+		break;
+#endif
 	case WL_SHM_FORMAT_YUV420:
 		gs->shader_variant = SHADER_VARIANT_Y_U_V;
 		pitch = wl_shm_buffer_get_stride(shm_buffer);
@@ -2061,7 +2086,8 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
 		es->is_opaque = true;
 		break;
 	default:
-		weston_log("warning: unknown shm buffer format: %08x\n",
+unsupported:
+		weston_log("warning: unknown or unsupported shm buffer format: %08x\n",
 			   wl_shm_buffer_get_format(shm_buffer));
 		return;
 	}
@@ -3654,12 +3680,6 @@ gl_renderer_display_create(struct weston_compositor *ec,
 			goto fail_with_error;
 	}
 
-	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_RGB565);
-	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420);
-	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12);
-	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV);
-	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_XYUV8888);
-
 	wl_signal_init(&gr->destroy_signal);
 
 	if (gl_renderer_setup(ec, gr->dummy_surface) < 0) {
@@ -3669,6 +3689,18 @@ gl_renderer_display_create(struct weston_compositor *ec,
 		goto fail_with_error;
 	}
 
+	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_RGB565);
+	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420);
+	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12);
+	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV);
+	wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_XYUV8888);
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	if (gr->has_texture_type_2_10_10_10_rev) {
+		wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_ABGR2101010);
+		wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_XBGR2101010);
+	}
+#endif
+
 	if (gr->gl_supports_color_transforms)
 		ec->capabilities |= WESTON_CAP_COLOR_OPS;
 
@@ -3830,6 +3862,10 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)
 		return -1;
 	}
 
+	if (gr->gl_version >= gr_gl_version(3, 0) ||
+	    weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV"))
+		gr->has_texture_type_2_10_10_10_rev = true;
+
 	if (gr->gl_version >= gr_gl_version(3, 0) ||
 	    weston_check_egl_extension(extensions, "GL_EXT_texture_rg"))
 		gr->has_gl_texture_rg = true;

man/weston.ini.man

@@ -669,6 +669,12 @@ sets the path to the xserver to run (string).
 sets the command to start a fullscreen-shell server for screen sharing (string).
 .RE
 .RE
+.TP 7
+.BI "start-on-startup=" "false"
+If set to true, start screen sharing of all outputs available on Weston startup.
+Set to false by default.
+.RE
+.RE
 .SH "AUTOLAUNCH SECTION"
 .TP 7
 .BI "path=" "/usr/bin/echo"

weston.ini.in

@@ -79,6 +79,7 @@ path=@libexecdir@/weston-keyboard
 
 [screen-share]
 command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize
+#start-on-startup=false
 
 #[xwayland]
 #path=@bindir@/Xwayland