From a1a5570e9735cb3ead0149b26d00eb4d6ade744f Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 30 Aug 2015 03:37:42 -0300 Subject: Replace the previous OpenGL loader with a glad-generated 3.3 one The main advantage of switching to glad from glLoadGen is that, apart from being actively maintained, it supports a customizable entrypoint loader function, which makes it possible to also support OpenGL ES. --- src/citra/emu_window/emu_window_glfw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/citra/emu_window/emu_window_glfw.cpp') diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 6d6656b5a..096efc4a2 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -7,7 +7,7 @@ #include // Let’s use our own GL header, instead of one from GLFW. -#include "video_core/renderer_opengl/generated/gl_3_2_core.h" +#include #define GLFW_INCLUDE_NONE #include -- cgit v1.2.3 From 68eb19749456ba653c8286080f5be99ffc1ce5e7 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 30 Aug 2015 04:29:03 -0300 Subject: Increase required OpenGL version to 3.3 This gives us several niceties such as Sampler Objects, shader attribute locations and Timer Queries. --- src/citra/emu_window/emu_window_glfw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/citra/emu_window/emu_window_glfw.cpp') diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 096efc4a2..9453b1f48 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -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); -- cgit v1.2.3