Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move OpenGLVersionChecker to gl library

Browse source
This commit is contained in:
David Rowe 2016-01-29 12:29:21 +13:00
parent b7134c75c3
commit 2020514974
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/main.cpp
View file

@ -17,12 +17,12 @@
#include <QSharedMemory> #include <QSharedMemory>
#include <QTranslator> #include <QTranslator>
#include <gl/OpenGLVersionChecker.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "AddressManager.h" #include "AddressManager.h"
#include "Application.h" #include "Application.h"
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "OpenGLVersionChecker.h"
#include "MainWindow.h" #include "MainWindow.h"
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {

10
interface/src/OpenGLVersionChecker.cpp → libraries/gl/src/gl/OpenGLVersionChecker.cpp
View file

@ -1,6 +1,6 @@
// //
// OpenGLVersionChecker.cpp // OpenGLVersionChecker.cpp
// interface/src // libraries/gl/src/gl
// //
// Created by David Rowe on 28 Jan 2016. // Created by David Rowe on 28 Jan 2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
@ -14,7 +14,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QRegularExpression> #include <QRegularExpression>
#include "GLCanvas.h" #include "GLWidget.h"
OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) : OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) :
QApplication(argc, argv) QApplication(argc, argv)
@ -25,10 +25,10 @@ bool OpenGLVersionChecker::isValidVersion() {
bool valid = true; bool valid = true;
// Retrieve OpenGL version // Retrieve OpenGL version
GLCanvas* glCanvas = new GLCanvas(); GLWidget* glWidget = new GLWidget();
glCanvas->initializeGL(); glWidget->initializeGL();
QString glVersion = QString((const char*)glGetString(GL_VERSION)); QString glVersion = QString((const char*)glGetString(GL_VERSION));
delete glCanvas; delete glWidget;
// Compare against minimum // Compare against minimum
// The GL_VERSION string begins with a version number in one of these forms: // The GL_VERSION string begins with a version number in one of these forms:

2
interface/src/OpenGLVersionChecker.h → libraries/gl/src/gl/OpenGLVersionChecker.h
View file

@ -1,6 +1,6 @@
// //
// OpenGLVersionChecker.h // OpenGLVersionChecker.h
// interface/src // libraries/gl/src/gl
// //
// Created by David Rowe on 28 Jan 2016. // Created by David Rowe on 28 Jan 2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.