From 0ab4a781f59513f598de3e4eaafb38a5a1e1c412 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 9 Nov 2016 18:25:37 -0800 Subject: [PATCH] Back to the correct code --- libraries/gl/src/gl/Context.cpp | 10 ++++------ libraries/gl/src/gl/OpenGLVersionChecker.cpp | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp index 221223d584..ec1c284e99 100644 --- a/libraries/gl/src/gl/Context.cpp +++ b/libraries/gl/src/gl/Context.cpp @@ -215,12 +215,10 @@ void Context::create() { } glewExperimental = true; glewInit(); - // if (glewIsSupported("GL_VERSION_4_5")) { - // _version = 0x0405; - // } else if (glewIsSupported("GL_VERSION_4_3")) { - /* } else*/ if (glewIsSupported("GL_VERSION_4_8")) { -///_version = 0x0403; - _version = 0x0404; + if (glewIsSupported("GL_VERSION_4_5")) { + _version = 0x0405; + } else if (glewIsSupported("GL_VERSION_4_3")) { + _version = 0x0403; } glGetError(); wglMakeCurrent(0, 0); diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.cpp b/libraries/gl/src/gl/OpenGLVersionChecker.cpp index 322a7bc484..428bf86c6f 100644 --- a/libraries/gl/src/gl/OpenGLVersionChecker.cpp +++ b/libraries/gl/src/gl/OpenGLVersionChecker.cpp @@ -22,8 +22,7 @@ #include "GLHelpers.h" // Minimum gl version required is 4.1 -//#define MINIMUM_GL_VERSION 0x0401 -#define MINIMUM_GL_VERSION 0x0408 +#define MINIMUM_GL_VERSION 0x0401 OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) : QApplication(argc, argv)