From 49f2fff2b06cefd59a7d314c6e049f224bb2ee11 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 29 Oct 2018 09:34:20 +0100 Subject: Proper OpenGL limit for QT --- 3rdparty/qtimgui/ImGuiRenderer.cpp | 2 +- 3rdparty/qtimgui/ImGuiRenderer.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/qtimgui/ImGuiRenderer.cpp b/3rdparty/qtimgui/ImGuiRenderer.cpp index 21a2423a..e77b47de 100644 --- a/3rdparty/qtimgui/ImGuiRenderer.cpp +++ b/3rdparty/qtimgui/ImGuiRenderer.cpp @@ -39,7 +39,7 @@ QByteArray g_currentClipboardText; void ImGuiRenderer::initialize(WindowWrapper *window) { m_window.reset(window); initializeOpenGLFunctions(); - g_fun = new QOpenGLFunctions_3_3_Core(); + g_fun = new QOpenGLFunctions_3_2_Core(); g_fun->initializeOpenGLFunctions(); ImGui::CreateContext(); diff --git a/3rdparty/qtimgui/ImGuiRenderer.h b/3rdparty/qtimgui/ImGuiRenderer.h index f0d7315e..8962c07b 100644 --- a/3rdparty/qtimgui/ImGuiRenderer.h +++ b/3rdparty/qtimgui/ImGuiRenderer.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ private: int g_AttribLocationTex = 0, g_AttribLocationProjMtx = 0; int g_AttribLocationPosition = 0, g_AttribLocationUV = 0, g_AttribLocationColor = 0; unsigned int g_VboHandle = 0, g_VaoHandle = 0, g_ElementsHandle = 0; - QOpenGLFunctions_3_3_Core *g_fun = nullptr; + QOpenGLFunctions_3_2_Core *g_fun = nullptr; }; } -- cgit v1.2.3