clients/simple-egl.c

@@ -151,7 +151,7 @@ init_egl(struct display *display, struct window *window)
 		EGL_NONE
 	};
 
-	EGLint major, minor, n, count, i, size;
+	EGLint major, minor, n, count, i;
 	EGLConfig *configs;
 	EGLBoolean ret;
 
@@ -179,9 +179,13 @@ init_egl(struct display *display, struct window *window)
 	assert(ret && n >= 1);
 
 	for (i = 0; i < n; i++) {
+		EGLint buffer_size, red_size;
 		eglGetConfigAttrib(display->egl.dpy,
-				   configs[i], EGL_BUFFER_SIZE, &size);
-		if (window->buffer_size == 0 || window->buffer_size == size) {
+				   configs[i], EGL_BUFFER_SIZE, &buffer_size);
+		eglGetConfigAttrib(display->egl.dpy,
+				   configs[i], EGL_RED_SIZE, &red_size);
+		if ((window->buffer_size == 0 ||
+		     window->buffer_size == buffer_size) && red_size < 10) {
 			display->egl.conf = configs[i];
 			break;
 		}

libweston/backend-x11/x11.c

@@ -857,7 +857,7 @@ x11_output_switch_mode(struct weston_output *base, struct weston_mode *mode)
 	} else {
 		Window xid = (Window) output->window;
 		const struct gl_renderer_output_options options = {
-			.window_for_legacy = (EGLNativeWindowType) output->window,
+			.window_for_legacy = (EGLNativeWindowType) (uintptr_t) output->window,
 			.window_for_platform = &xid,
 			.drm_formats = x11_formats,
 			.drm_formats_count = ARRAY_LENGTH(x11_formats),
@@ -1037,7 +1037,7 @@ x11_output_enable(struct weston_output *base)
 		 * but eglCreateWindowSurface takes a Window. */
 		Window xid = (Window) output->window;
 		const struct gl_renderer_output_options options = {
-			.window_for_legacy = (EGLNativeWindowType) output->window,
+			.window_for_legacy = (EGLNativeWindowType) (uintptr_t) output->window,
 			.window_for_platform = &xid,
 			.drm_formats = x11_formats,
 			.drm_formats_count = ARRAY_LENGTH(x11_formats),

remoting/remoting-plugin.c

@@ -572,7 +572,8 @@ remoting_output_frame(struct weston_output *output_base, int fd, int stride,
 	struct wl_event_loop *loop;
 	GstBuffer *buf;
 	GstMemory *mem;
-	gsize offset = 0;
+	gsize offsets[4] = { 0, };
+	gint strides[4] = { stride, };
 	struct mem_free_cb_data *cb_data;
 	struct gst_frame_buffer_data *frame_data;
 
@@ -594,8 +595,8 @@ remoting_output_frame(struct weston_output *output_base, int fd, int stride,
 				       mode->width,
 				       mode->height,
 				       1,
-				       &offset,
-				       &stride);
+				       offsets,
+				       strides);
 
 	cb_data->output = output;
 	cb_data->output_buffer = output_buffer;