--- qt-everywhere-src-5.15.8.old/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/util.hpp +++ qt-everywhere-src-5.15.8/qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/util.hpp @@ -19,3 +19,5 @@ #else #define MBGL_CONSTEXPR inline #endif + +#include --- qt-everywhere-src-5.15.8.old/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +++ qt-everywhere-src-5.15.8/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp @@ -1,3 +1,4 @@ +#include #include #include --- qt-everywhere-src-5.15.8.old/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h +++ qt-everywhere-src-5.15.8/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h @@ -79,7 +79,7 @@ #pragma warning(disable: 4244) #endif -#include "pcre.h" +#include "jspcre.h" /* The value of LINK_SIZE determines the number of bytes used to store links as offsets within the compiled regex. The default is 2, which allows for compiled --- qt-everywhere-src-5.15.8.old/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp +++ qt-everywhere-src-5.15.8/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp @@ -44,7 +44,7 @@ #include "JIT.h" #include "WRECGenerator.h" #endif -#include +#include "../pcre/jspcre.h" #endif --- qt-everywhere-src-5.15.8.old/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp +++ qt-everywhere-src-5.15.8/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp @@ -32,7 +32,7 @@ #include "MacroAssembler.h" #include "RegexCompiler.h" -#include "pcre.h" // temporary, remove when fallback is removed. +#include "../pcre/pcre.h" #if ENABLE(YARR_JIT) --- qt-everywhere-src-5.15.8.old/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h +++ qt-everywhere-src-5.15.8/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h @@ -34,7 +34,7 @@ #include "RegexPattern.h" #include -#include +#include "../pcre/jspcre.h" struct JSRegExp; // temporary, remove when fallback is removed. #if CPU(X86) && !COMPILER(MSVC) --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h @@ -13,6 +13,7 @@ #include "base/base_export.h" #include "base/macros.h" +#include namespace base { --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_utils.cc +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -20,6 +20,10 @@ #include "base/numerics/safe_math.h" #include "base/stl_util.h" +#ifndef GL_CONTEXT_LOST_KHR +#define GL_CONTEXT_LOST_KHR 0x0507 +#endif + namespace gpu { namespace gles2 { --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/error_state.cc +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/error_state.cc @@ -108,9 +108,9 @@ GLenum ErrorStateImpl::GetErrorHandleContextLoss() { GLenum error = glGetError(); - if (error == GL_CONTEXT_LOST_KHR) { + if (error == 0x0507) { client_->OnContextLostError(); - // Do not expose GL_CONTEXT_LOST_KHR, as the version of the robustness + // Do not expose 0x0507, as the version of the robustness // extension that introduces the error is not exposed by the command // buffer. error = GL_NO_ERROR; @@ -205,7 +205,7 @@ // Clears and logs all current gl errors. GLenum error; while ((error = glGetError()) != GL_NO_ERROR) { - if (error != GL_CONTEXT_LOST_KHR && error != GL_OUT_OF_MEMORY) { + if (error != 0x0507 && error != GL_OUT_OF_MEMORY) { // GL_OUT_OF_MEMORY can legally happen on lost device. logger_->LogMessage( filename, line, --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_lost.cc +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_lost.cc @@ -109,7 +109,7 @@ void DoGetErrorWithContextLost(GLenum reset_status) { DCHECK(context_->HasExtension("GL_KHR_robustness")); EXPECT_CALL(*gl_, GetError()) - .WillOnce(Return(GL_CONTEXT_LOST_KHR)) + .WillOnce(Return(0x0507)) .RetiresOnSaturation(); EXPECT_CALL(*gl_, GetGraphicsResetStatusARB()) .WillOnce(Return(reset_status)); @@ -122,7 +122,7 @@ void ClearCurrentDecoderError() { DCHECK(decoder_->WasContextLost()); EXPECT_CALL(*gl_, GetError()) - .WillOnce(Return(GL_CONTEXT_LOST_KHR)) + .WillOnce(Return(0x0507)) .RetiresOnSaturation(); cmds::GetError cmd; cmd.Init(shared_memory_id_, shared_memory_offset_); --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.cc +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.cc @@ -765,7 +765,7 @@ LOG(ERROR) << "SharedContextState lost due to GL_OUT_OF_MEMORY"; return error::kOutOfMemory; } - if (error == GL_CONTEXT_LOST_KHR) + if (error == 0x0507) // GL_CONTEXT_LOST_KHR break; } // Checking the reset status is expensive on some OS/drivers --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/ppapi/c/ppb_opengles2.h +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/ppapi/c/ppb_opengles2.h @@ -7,6 +7,8 @@ #ifndef PPAPI_C_PPB_OPENGLES2_H_ #define PPAPI_C_PPB_OPENGLES2_H_ +#include + #include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/PackedEnums.cpp +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/PackedEnums.cpp @@ -500,8 +500,10 @@ case EGL_TEXTURE_2D: return gl::TextureType::_2D; +#ifdef EGL_TEXTURE_RECTANGLE_ANGLE case EGL_TEXTURE_RECTANGLE_ANGLE: return gl::TextureType::Rectangle; +#endif default: UNREACHABLE(); --- qt-everywhere-src-5.15.8.old/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp +++ qt-everywhere-src-5.15.8/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp @@ -1146,8 +1146,11 @@ switch (target) { case EGL_NATIVE_BUFFER_ANDROID: - case EGL_D3D11_TEXTURE_ANGLE: case EGL_LINUX_DMA_BUF_EXT: + +#ifdef EGL_D3D11_TEXTURE_ANGLE + case EGL_D3D11_TEXTURE_ANGLE: +#endif return true; default: