From 61239efa39ca75ef1c3c28f76e869be57daf1650 Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Tue, 1 Mar 2022 19:15:12 +0200 Subject: [PATCH] qt: fix linux arm32 build error --- src/qt/qt_openglrenderer.cpp | 4 ++-- src/qt/qt_openglrenderer.hpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qt/qt_openglrenderer.cpp b/src/qt/qt_openglrenderer.cpp index b1a911841..173e82448 100644 --- a/src/qt/qt_openglrenderer.cpp +++ b/src/qt/qt_openglrenderer.cpp @@ -202,7 +202,7 @@ OpenGLRenderer::getOptions(QWidget *parent) void OpenGLRenderer::setupExtensions() { -#ifndef Q_OS_MACOS +#ifndef NO_BUFFER_STORAGE if (context->hasExtension("GL_ARB_buffer_storage")) { hasBufferStorage = true; @@ -219,7 +219,7 @@ OpenGLRenderer::setupBuffers() glBindBuffer(GL_PIXEL_UNPACK_BUFFER, unpackBufferID); if (hasBufferStorage) { -#ifndef Q_OS_MACOS +#ifndef NO_BUFFER_STORAGE /* Create persistent buffer for pixel transfer. */ glBufferStorage(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * BUFFERCOUNT, NULL, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); diff --git a/src/qt/qt_openglrenderer.hpp b/src/qt/qt_openglrenderer.hpp index 83490f293..47bc82c22 100644 --- a/src/qt/qt_openglrenderer.hpp +++ b/src/qt/qt_openglrenderer.hpp @@ -17,13 +17,17 @@ #ifndef QT_OPENGLRENDERER_HPP #define QT_OPENGLRENDERER_HPP +#if defined Q_OS_MACOS || __arm__ +# define NO_BUFFER_STORAGE +#endif + #include #include #include #include #include #include -#if !defined Q_OS_MACOS && !(QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#if !defined NO_BUFFER_STORAGE && !(QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) # include #endif @@ -94,7 +98,7 @@ private: /* GL_ARB_buffer_storage */ bool hasBufferStorage = false; -#ifndef Q_OS_MACOS +#ifndef NO_BUFFER_STORAGE PFNGLBUFFERSTORAGEPROC glBufferStorage = nullptr; #endif