Browse Source

Switching from OpenGL 2 to OpenGL 3.2 for no reason

tags/v0.3.0
Andrew Belt 8 years ago
parent
commit
ab091bec31
1 changed files with 9 additions and 5 deletions
  1. +9
    -5
      src/gui.cpp

+ 9
- 5
src/gui.cpp View File

@@ -8,7 +8,7 @@


// Include implementations here // Include implementations here
// By the way, please stop packaging your libraries like this. It's easiest to use a single source file (e.g. foo.c) and a single header (e.g. foo.h) // By the way, please stop packaging your libraries like this. It's easiest to use a single source file (e.g. foo.c) and a single header (e.g. foo.h)
#define NANOVG_GL2_IMPLEMENTATION
#define NANOVG_GL3_IMPLEMENTATION
#include "../ext/nanovg/src/nanovg_gl.h" #include "../ext/nanovg/src/nanovg_gl.h"
#define BLENDISH_IMPLEMENTATION #define BLENDISH_IMPLEMENTATION
#include "../ext/oui/blendish.h" #include "../ext/oui/blendish.h"
@@ -180,8 +180,12 @@ void guiInit() {
err = glfwInit(); err = glfwInit();
assert(err); assert(err);


glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
#ifndef WINDOWS
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
#endif
window = glfwCreateWindow(1000, 750, gApplicationName.c_str(), NULL, NULL); window = glfwCreateWindow(1000, 750, gApplicationName.c_str(), NULL, NULL);
assert(window); assert(window);
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
@@ -206,7 +210,7 @@ void guiInit() {
glfwSetWindowSizeLimits(window, 240, 160, GLFW_DONT_CARE, GLFW_DONT_CARE); glfwSetWindowSizeLimits(window, 240, 160, GLFW_DONT_CARE, GLFW_DONT_CARE);


// Set up NanoVG // Set up NanoVG
vg = nvgCreateGL2(NVG_ANTIALIAS);
vg = nvgCreateGL3(NVG_ANTIALIAS);
assert(vg); assert(vg);


// Set up Blendish // Set up Blendish
@@ -217,7 +221,7 @@ void guiInit() {


void guiDestroy() { void guiDestroy() {
defaultFont.reset(); defaultFont.reset();
nvgDeleteGL2(vg);
nvgDeleteGL3(vg);
glfwDestroyWindow(window); glfwDestroyWindow(window);
glfwTerminate(); glfwTerminate();
} }


Loading…
Cancel
Save