summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-08-30 03:37:42 -0300
committerGravatar Yuri Kunde Schlesner2015-08-30 08:45:56 -0300
commita1a5570e9735cb3ead0149b26d00eb4d6ade744f (patch)
treea044f6116c24f0618f34c73154cd8c86e89711c7 /src/citra
parentMerge pull request #1049 from Subv/stencil (diff)
downloadyuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.gz
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.xz
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.zip
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.
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/CMakeLists.txt4
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 1d6aac9a9..beb96bd30 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -15,7 +15,7 @@ create_directory_groups(${SRCS} ${HEADERS})
15 15
16add_executable(citra ${SRCS} ${HEADERS}) 16add_executable(citra ${SRCS} ${HEADERS})
17target_link_libraries(citra core video_core common) 17target_link_libraries(citra core video_core common)
18target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) 18target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih glad)
19if (MSVC) 19if (MSVC)
20 target_link_libraries(citra getopt) 20 target_link_libraries(citra getopt)
21endif() 21endif()
@@ -23,4 +23,4 @@ target_link_libraries(citra ${PLATFORM_LIBRARIES})
23 23
24if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") 24if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD")
25 install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 25 install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
26endif() \ No newline at end of file 26endif()
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 @@
7#include <string> 7#include <string>
8 8
9// Let’s use our own GL header, instead of one from GLFW. 9// Let’s use our own GL header, instead of one from GLFW.
10#include "video_core/renderer_opengl/generated/gl_3_2_core.h" 10#include <glad/glad.h>
11#define GLFW_INCLUDE_NONE 11#define GLFW_INCLUDE_NONE
12#include <GLFW/glfw3.h> 12#include <GLFW/glfw3.h>
13 13