Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:29:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Specify minimum OpenGL version in gl library's config

Browse source 
Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface
soon properly supporting both 4.1 and 4.3 on Windows.
This commit is contained in:
David Rowe 2016-01-29 13:03:54 +13:00
parent 2020514974
commit 6232a83f43
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gl/src/gl/Config.h
View file

@ -19,6 +19,7 @@
#define GPU_LEGACY 0 #define GPU_LEGACY 0
#define GPU_CORE_41 410 #define GPU_CORE_41 410
#define GPU_CORE_43 430 #define GPU_CORE_43 430
#define GPU_CORE_MINIMUM GPU_CORE_41
#if defined(__APPLE__) #if defined(__APPLE__)

11
libraries/gl/src/gl/OpenGLVersionChecker.cpp
View file

@ -14,6 +14,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QRegularExpression> #include <QRegularExpression>
#include "Config.h"
#include "GLWidget.h" #include "GLWidget.h"
OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) : OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) :
@ -35,13 +36,13 @@ bool OpenGLVersionChecker::isValidVersion() {
// - major_number.minor_number // - major_number.minor_number
// - major_number.minor_number.release_number // - major_number.minor_number.release_number
// Reference: https://www.opengl.org/sdk/docs/man/docbook4/xhtml/glGetString.xml // Reference: https://www.opengl.org/sdk/docs/man/docbook4/xhtml/glGetString.xml
const int MINIMUM_OPENGL_MAJOR_VERSION = 4;
const int MINIMUM_OPENGL_MINOR_VERSION = 1;
QStringList versionParts = glVersion.split(QRegularExpression("[\\.\\s]")); QStringList versionParts = glVersion.split(QRegularExpression("[\\.\\s]"));
int majorNumber = versionParts[0].toInt(); int majorNumber = versionParts[0].toInt();
int minorNumber = versionParts[1].toInt(); int minorNumber = versionParts[1].toInt();
valid = (majorNumber > MINIMUM_OPENGL_MAJOR_VERSION int minimumMajorNumber = GPU_CORE_MINIMUM / 100;
|| (majorNumber == MINIMUM_OPENGL_MAJOR_VERSION && minorNumber >= MINIMUM_OPENGL_MINOR_VERSION)); int minimumMinorNumber = (GPU_CORE_MINIMUM - minimumMajorNumber * 100) / 10;
valid = (majorNumber > minimumMajorNumber
|| (majorNumber == minimumMajorNumber && minorNumber >= minimumMinorNumber));
// Prompt user if below minimum // Prompt user if below minimum
if (!valid) { if (!valid) {
@ -49,7 +50,7 @@ bool OpenGLVersionChecker::isValidVersion() {
messageBox.setWindowTitle("OpenGL Version Too Low"); messageBox.setWindowTitle("OpenGL Version Too Low");
messageBox.setIcon(QMessageBox::Warning); messageBox.setIcon(QMessageBox::Warning);
messageBox.setText(QString().sprintf("Your OpenGL version of %i.%i is lower than the minimum of %i.%i.", messageBox.setText(QString().sprintf("Your OpenGL version of %i.%i is lower than the minimum of %i.%i.",
majorNumber, minorNumber, MINIMUM_OPENGL_MAJOR_VERSION, MINIMUM_OPENGL_MINOR_VERSION)); majorNumber, minorNumber, minimumMajorNumber, minimumMinorNumber));
messageBox.setInformativeText("Press OK to exit; Ignore to continue."); messageBox.setInformativeText("Press OK to exit; Ignore to continue.");
messageBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Ignore); messageBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Ignore);
messageBox.setDefaultButton(QMessageBox::Ok); messageBox.setDefaultButton(QMessageBox::Ok);