Fix merge glitches

desktop-shell/shell.c

@@ -3619,29 +3619,6 @@ shell_fade_create_fade_out_view(struct shell_surface *shsurf,
 	return view;
 }
 
-static struct weston_view *
-shell_fade_create_fade_out_view(struct shell_surface *shsurf,
-				struct weston_surface *surface)
-{
-	struct weston_view *view;
-	struct weston_output *woutput;
-
-	view = weston_view_create(surface);
-	if (!view)
-		return NULL;
-
-	woutput = get_focused_output(surface->compositor);
-	/* set the initial position and output just in case we happen to not
-	 * move it around and just destroy it */
-	weston_view_set_output(view, woutput);
-	weston_view_set_position(view,
-				 shsurf->view->geometry.x,
-				 shsurf->view->geometry.y);
-	view->is_mapped = true;
-
-	return view;
-}
-
 static void
 shell_fade(struct desktop_shell *shell, enum fade_type type)
 {

libweston/renderer-gl/fragment.glsl

@@ -81,9 +81,6 @@ compile_const bool c_need_color_pipeline =
 	c_color_pre_curve != SHADER_COLOR_CURVE_IDENTITY ||
 	c_color_mapping != SHADER_COLOR_MAPPING_IDENTITY;
 
-compile_const bool c_need_color_pipeline =
-	c_color_pre_curve != SHADER_COLOR_CURVE_IDENTITY;
-
 vec4
 yuva2rgba(vec4 yuva)
 {