Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -9,11 +9,9 @@ · 8 unmodified lines | |||
| 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | // | 10 | // |
| 11 | 11 | ||
| 12 | #include <sstream> | 12 | #include "Application.h" |
| 13 | 13 | ||
| 14 | #include <stdlib.h> | 14 | #include <sstream> |
| 15 | #include <cmath> | ||
| 16 | #include <math.h> | ||
| 17 | 15 | ||
| 18 | #include <glm/glm.hpp> | 16 | #include <glm/glm.hpp> |
| 19 | #include <glm/gtx/component_wise.hpp> | 17 | #include <glm/gtx/component_wise.hpp> |
| @@ -92,7 +90,6 @@ · 72 unmodified lines | |||
| 92 | #include <UUID.h> | 90 | #include <UUID.h> |
| 93 | #include <VrMenu.h> | 91 | #include <VrMenu.h> |
| 94 | 92 | ||
| 95 | #include "Application.h" | ||
| 96 | #include "AudioClient.h" | 93 | #include "AudioClient.h" |
| 97 | #include "DiscoverabilityManager.h" | 94 | #include "DiscoverabilityManager.h" |
| 98 | #include "GLCanvas.h" | 95 | #include "GLCanvas.h" |
| @@ -766,25 +763,6 @@ void Application::initializeGL() { · 667 unmodified lines | |||
| 766 | } | 763 | } |
| 767 | #endif | 764 | #endif |
| 768 | 765 | ||
| 769 | qCDebug(interfaceapp) << "GL Version: " << QString((const char*) glGetString(GL_VERSION)); | ||
| 770 | qCDebug(interfaceapp) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION)); | ||
| 771 | qCDebug(interfaceapp) << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR)); | ||
| 772 | qCDebug(interfaceapp) << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER)); | ||
| 773 | |||
| 774 | #ifdef WIN32 | ||
| 775 | GLenum err = glewInit(); | ||
| 776 | if (GLEW_OK != err) { | ||
| 777 | /* Problem: glewInit failed, something is seriously wrong. */ | ||
| 778 | qCDebug(interfaceapp, "Error: %s\n", glewGetErrorString(err)); | ||
| 779 | } | ||
| 780 | qCDebug(interfaceapp, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); | ||
| 781 | |||
| 782 | if (wglewGetExtension("WGL_EXT_swap_control")) { | ||
| 783 | int swapInterval = wglGetSwapIntervalEXT(); | ||
| 784 | qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); | ||
| 785 | } | ||
| 786 | #endif | ||
| 787 | |||
| 788 | #if defined(Q_OS_LINUX) | 766 | #if defined(Q_OS_LINUX) |
| 789 | // TODO: Write the correct code for Linux... | 767 | // TODO: Write the correct code for Linux... |
| 790 | /* if (wglewGetExtension("WGL_EXT_swap_control")) { | 768 | /* if (wglewGetExtension("WGL_EXT_swap_control")) { |