diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-03 15:07:01 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-03 15:07:01 -0300 |
| commit | cc19a766563f718fd62548dbb9166919cff1a8c3 (patch) | |
| tree | b8455a2f4b1b4ec977ab177593fdb84bb10e8e4f /src/citra/emu_window/emu_window_glfw.cpp | |
| parent | bc59aaccb134fabe383bf262281d677a98fe761e (diff) | |
| parent | 68eb19749456ba653c8286080f5be99ffc1ce5e7 (diff) | |
Merge pull request #1087 from yuriks/opengl-glad
Replace the previous OpenGL loader with a glad-generated 3.3 one
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 6d6656b5a..9453b1f48 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -7,7 +7,7 @@ #include <string> // Let’s use our own GL header, instead of one from GLFW. -#include "video_core/renderer_opengl/generated/gl_3_2_core.h" +#include <glad/glad.h> #define GLFW_INCLUDE_NONE #include <GLFW/glfw3.h> @@ -89,7 +89,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { exit(1); } glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); |