1 files changed, 23 insertions, 4 deletions

diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index d16173df83..c96021a969 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -54,14 +54,19 @@ QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(DBG_SHADER_CACHE)
 
+#ifndef GL_CONTEXT_LOST
+#define GL_CONTEXT_LOST                   0x0507
+#endif
+
 #ifndef GL_PROGRAM_BINARY_LENGTH
 #define GL_PROGRAM_BINARY_LENGTH          0x8741
 #endif
 
 const quint32 BINSHADER_MAGIC = 0x5174;
-const quint32 BINSHADER_VERSION = 0x2;
+const quint32 BINSHADER_VERSION = 0x3;
 const quint32 BINSHADER_QTVERSION = QT_VERSION;
 
+namespace {
 struct GLEnvInfo
 {
     GLEnvInfo();
@@ -70,6 +75,7 @@ struct GLEnvInfo
     QByteArray glrenderer;
     QByteArray glversion;
 };
+}
 
 GLEnvInfo::GLEnvInfo()
 {
@@ -114,7 +120,7 @@ QString QOpenGLProgramBinaryCache::cacheFileName(const QByteArray &cacheKey) con
     return m_cacheDir + QString::fromUtf8(cacheKey);
 }
 
-#define BASE_HEADER_SIZE (int(3 * sizeof(quint32)))
+#define BASE_HEADER_SIZE (int(4 * sizeof(quint32)))
 #define FULL_HEADER_SIZE(stringsSize) (BASE_HEADER_SIZE + 12 + stringsSize + 8)
 #define PADDING_SIZE(fullHeaderSize) (((fullHeaderSize + 3) & ~3) - fullHeaderSize)
 
@@ -153,13 +159,21 @@ bool QOpenGLProgramBinaryCache::verifyHeader(const QByteArray &buf) const
         qCDebug(DBG_SHADER_CACHE, "Qt version does not match");
         return false;
     }
+    if (readUInt(&p) != sizeof(quintptr)) {
+        qCDebug(DBG_SHADER_CACHE, "Architecture does not match");
+        return false;
+    }
     return true;
 }
 
 bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat, const void *p, uint blobSize)
 {
     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
-    while (funcs->glGetError() != GL_NO_ERROR) { }
+    while (true) {
+        GLenum error = funcs->glGetError();
+        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST)
+            break;
+    }
     funcs->glProgramBinary(programId, blobFormat, p, blobSize);
 
     GLenum err = funcs->glGetError();
@@ -335,7 +349,11 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId)
 
     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
     GLint blobSize = 0;
-    while (funcs->glGetError() != GL_NO_ERROR) { }
+    while (true) {
+        GLenum error = funcs->glGetError();
+        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST)
+            break;
+    }
     funcs->glGetProgramiv(programId, GL_PROGRAM_BINARY_LENGTH, &blobSize);
 
     const int headerSize = FULL_HEADER_SIZE(info.glvendor.size() + info.glrenderer.size() + info.glversion.size());
@@ -357,6 +375,7 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId)
     writeUInt(&p, BINSHADER_MAGIC);
     writeUInt(&p, BINSHADER_VERSION);
     writeUInt(&p, BINSHADER_QTVERSION);
+    writeUInt(&p, sizeof(quintptr));
 
     writeStr(&p, info.glvendor);
     writeStr(&p, info.glrenderer);