Backport a patch to fix inverted colours

This commit is contained in:
Kalev Lember 2019-03-06 21:14:59 +01:00
parent 91a7290a30
commit a873e5a46b
2 changed files with 50 additions and 1 deletions

41
479.patch Normal file
View File

@ -0,0 +1,41 @@
From 4f72099023bc5bb142a782a1924797729329cc9a Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@posteo.de>
Date: Wed, 6 Mar 2019 16:57:09 +0100
Subject: [PATCH] Revert "cogl: Pick glReadPixels format by target, not source"
This reverts commit 981b045459350d141fdfd16355cf2f4cd0aebc0f.
Fixes https://gitlab.gnome.org/GNOME/mutter/issues/418
---
cogl/cogl/driver/gl/cogl-framebuffer-gl.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
index c2bf92882..84c2f314a 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -4,7 +4,6 @@
* A Low Level GPU Graphics and Utilities API
*
* Copyright (C) 2007,2008,2009,2012 Intel Corporation.
- * Copyright (C) 2018 DisplayLink (UK) Ltd.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -1274,12 +1273,9 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
if (!cogl_is_offscreen (framebuffer))
y = framebuffer_height - y - height;
- /* Use target format ANY, because GL texture_swizzle extension cannot
- * ever apply for glReadPixels.
- */
required_format = ctx->driver_vtable->pixel_format_to_gl_with_target (ctx,
+ framebuffer->internal_format,
format,
- COGL_PIXEL_FORMAT_ANY,
&gl_intformat,
&gl_format,
&gl_type);
--
2.18.1

View File

@ -8,7 +8,7 @@
Name: mutter
Version: 3.31.92
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Window and compositing manager based on Clutter
License: GPLv2+
@ -19,6 +19,11 @@ Source0: http://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}
# Work-around for OpenJDK's compliance test
Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch
# Fix inverted colours
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/479
# https://gitlab.gnome.org/GNOME/mutter/issues/418
Patch1: 479.patch
BuildRequires: chrpath
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
@ -160,6 +165,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/mutter-%{mutter_api_version}/tests
%changelog
* Wed Mar 06 2019 Kalev Lember <klember@redhat.com> - 3.31.92-2
- Backport a patch to fix inverted colours
* Tue Mar 05 2019 Florian Müllner <fmuellner@redhat.com> - 3.31.92-1
- Update to 3.31.92