From 5862f9f284986a56e119cef92fd3dad9beebd031 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Tue, 11 Apr 2023 12:18:01 +0400 Subject: [PATCH] Do not use GL ES wrappers --- extern/osgQt/osgQOpenGLWidget.cpp | 2 -- extern/osgQt/osgQOpenGLWidget.hpp | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/extern/osgQt/osgQOpenGLWidget.cpp b/extern/osgQt/osgQOpenGLWidget.cpp index 0f2fba71cc..d52f3c02ac 100644 --- a/extern/osgQt/osgQOpenGLWidget.cpp +++ b/extern/osgQt/osgQOpenGLWidget.cpp @@ -41,8 +41,6 @@ std::mutex* osgQOpenGLWidget::mutex() void osgQOpenGLWidget::initializeGL() { - // Initializes OpenGL function resolution for the current context. - initializeOpenGLFunctions(); createRenderer(); emit initialized(); } diff --git a/extern/osgQt/osgQOpenGLWidget.hpp b/extern/osgQt/osgQOpenGLWidget.hpp index 07ffc12248..8677b146f8 100644 --- a/extern/osgQt/osgQOpenGLWidget.hpp +++ b/extern/osgQt/osgQOpenGLWidget.hpp @@ -10,7 +10,6 @@ #include #include -#include #include class CompositeOsgRenderer; @@ -21,8 +20,7 @@ namespace osgViewer class GraphicsWindowEmbedded; } -class osgQOpenGLWidget : public QOpenGLWidget, - protected QOpenGLFunctions +class osgQOpenGLWidget : public QOpenGLWidget { Q_OBJECT