diff --git a/opengl-Bail-if-cached-shader-fails-to-load.patch b/0111-opengl-Bail-if-cached-shader-fails-to-load.patch similarity index 59% rename from opengl-Bail-if-cached-shader-fails-to-load.patch rename to 0111-opengl-Bail-if-cached-shader-fails-to-load.patch index fbd26da..410f1a5 100644 --- a/opengl-Bail-if-cached-shader-fails-to-load.patch +++ b/0111-opengl-Bail-if-cached-shader-fails-to-load.patch @@ -1,9 +1,7 @@ -From 3bb3ee936f27e9749bf1a2c4bd5ded2f5167663f Mon Sep 17 00:00:00 2001 -From: Max Staudt -Date: Mon, 12 Feb 2018 15:07:29 +0100 -Subject: [PATCH] opengl: Bail if cached shader fails to load -References: boo#1080578, boo#1079465 -Signed-off-by: Max Staudt +From ef20989bf05c13b18eba4aac6f464c5be71136fa Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Fri, 16 Feb 2018 13:18:42 +0100 +Subject: [PATCH 111/111] opengl: Bail if cached shader fails to load QOpenGLProgramBinaryCache::setProgramBinary() should check GL_LINK_STATUS after glProgramBinary(), but doesn't. @@ -19,32 +17,42 @@ pipeline shader. Checking this already in ::setProgramBinary() makes the call to ::link() superfluous, so we remove that as well. -Many thanks to Michal Srb and Fabian Vogt for hunting this down. -This was truly a joint effort. - -Cc: Michal Srb -Cc: Fabian Vogt -Signed-off-by: Max Staudt +Done-with: Max Staudt +Done-with: Michal Srb +Done-with: Fabian Vogt +Task-number: QTBUG-66420 +Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82 +Reviewed-by: Jesus Fernandez +Reviewed-by: Laszlo Agocs +(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf) --- - src/gui/opengl/qopenglprogrambinarycache.cpp | 11 ++++++++++- + src/gui/opengl/qopenglprogrambinarycache.cpp | 20 ++++++++++++++++++-- src/gui/opengl/qopenglshaderprogram.cpp | 8 +------- - 2 files changed, 11 insertions(+), 8 deletions(-) + 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp -index 06373e1113..f50878ab5c 100644 +index 06373e1113..d16173df83 100644 --- a/src/gui/opengl/qopenglprogrambinarycache.cpp +++ b/src/gui/opengl/qopenglprogrambinarycache.cpp -@@ -161,10 +161,19 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat +@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions(); while (funcs->glGetError() != GL_NO_ERROR) { } funcs->glProgramBinary(programId, blobFormat, p, blobSize); +- int err = funcs->glGetError(); + - int err = funcs->glGetError(); -+ GLint link_status = 0; -+ funcs->glGetProgramiv(programId, GL_LINK_STATUS, &link_status); -+ if (link_status != GL_TRUE || err != GL_NO_ERROR) { -+ qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, format 0x%x, link_status = 0x%x, err = 0x%x", -+ programId, blobSize, blobFormat, link_status, err); ++ GLenum err = funcs->glGetError(); ++ if (err != GL_NO_ERROR) { ++ qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, " ++ "format 0x%x, err = 0x%x", ++ programId, blobSize, blobFormat, err); ++ return false; ++ } ++ GLint linkStatus = 0; ++ funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus); ++ if (linkStatus != GL_TRUE) { ++ qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, " ++ "format 0x%x, linkStatus = 0x%x, err = 0x%x", ++ programId, blobSize, blobFormat, linkStatus, err); + return false; + } + @@ -75,5 +83,5 @@ index cc8af16bfe..3b82baccb3 100644 bool needsSave = false; -- -2.13.6 +2.14.3 diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 839f1d2..75dffe8 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.9.4 -Release: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -104,9 +104,6 @@ Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch # Fixed upstream in shared-mime-info 1.10 Patch53: qtbase-fdo101667.patch -# https://bugreports.qt.io/browse/QTBUG-66420 -Patch55: https://bugreports.qt.io/secure/attachment/69873/opengl-Bail-if-cached-shader-fails-to-load.patch - # drop -O3 and make -O2 by default Patch61: qt5-qtbase-cxxflag.patch @@ -133,6 +130,7 @@ Patch150: 0050-glx-Avoid-losing-the-stereo-flag-in-QSurfaceFormat.patch Patch168: 0068-QHeaderView-properly-restore-section-data-after-layo.patch Patch169: 0069-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch Patch170: 0070-Fix-native-QFileDialog-initial-selection-for-remote-.patch +Patch211: 0111-opengl-Bail-if-cached-shader-fails-to-load.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -368,7 +366,6 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch51 -p1 -b .hidpi_scale_at_192 %patch52 -p1 -b .moc_macros %patch53 -p1 -b .fdo101667 -%patch55 -p1 -b .QTBUG-66420 %patch61 -p1 -b .qt5-qtbase-cxxflag %if 0%{?openssl11} %patch63 -p1 -b .openssl11 @@ -388,6 +385,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. #patch168 -p1 -b .0068 %patch169 -p1 -b .0069 %patch170 -p1 -b .0070 +%patch211 -p1 -b .0111 %if 0%{?inject_optflags} ## adjust $RPM_OPT_FLAGS @@ -1005,6 +1003,9 @@ fi %changelog +* Thu Feb 22 2018 Rex Dieter - 5.9.4-6 +- use upstreamed version of QOpenGLShaderProgram fix (QTBUG-66420) + * Wed Feb 21 2018 Rex Dieter - 5.9.4-5 - QOpenGLShaderProgram: glProgramBinary() resulting in LINK_STATUS=FALSE not handled properly (QTBUG-66420)