Merge pull request #4554 from samcake/yellow

Better support for Nvidia Optimus Laptop
This commit is contained in:
Brad Hefta-Gaub 2015-03-31 15:56:01 -07:00
commit b6f670a8d8

View file

@ -136,6 +136,13 @@
#include "ui/StandAloneJSConsole.h"
#include "ui/Stats.h"
// ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
#if defined(Q_OS_WIN)
extern "C" {
_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
}
#endif
using namespace std;
// Starfield information
@ -646,6 +653,11 @@ void Application::initializeGL() {
}
#endif
qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
#ifdef WIN32
GLenum err = glewInit();
if (GLEW_OK != err) {