Merge pull request #1087 from yuriks/opengl-glad
Replace the previous OpenGL loader with a glad-generated 3.3 one
This commit is contained in:
		| @@ -213,6 +213,7 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih") | |||||||
| include_directories(${INI_PREFIX}) | include_directories(${INI_PREFIX}) | ||||||
| add_subdirectory(${INI_PREFIX}) | add_subdirectory(${INI_PREFIX}) | ||||||
|  |  | ||||||
|  | add_subdirectory(externals/glad) | ||||||
| include_directories(externals/microprofile) | include_directories(externals/microprofile) | ||||||
| include_directories(externals/nihstro/include) | include_directories(externals/nihstro/include) | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								externals/glad/CMakeLists.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								externals/glad/CMakeLists.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | set(SRCS | ||||||
|  |             src/glad.c | ||||||
|  |             ) | ||||||
|  | set(HEADERS | ||||||
|  |             include/KHR/khrplatform.h | ||||||
|  |             include/glad/glad.h | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  | create_directory_groups(${SRCS} ${HEADERS}) | ||||||
|  | add_library(glad STATIC ${SRCS} ${HEADERS}) | ||||||
|  | target_include_directories(glad PUBLIC "include/") | ||||||
							
								
								
									
										5
									
								
								externals/glad/Readme.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								externals/glad/Readme.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | These files were generated by the [glad](https://github.com/Dav1dde/glad) OpenGL loader generator and have been checked in as-is. You can re-generate them using glad with the following command: | ||||||
|  |  | ||||||
|  | ``` | ||||||
|  | python -m glad --profile core --out-path glad/ --api gl=3.3,gles=3.0 | ||||||
|  | ``` | ||||||
							
								
								
									
										282
									
								
								externals/glad/include/KHR/khrplatform.h
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										282
									
								
								externals/glad/include/KHR/khrplatform.h
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,282 @@ | |||||||
|  | #ifndef __khrplatform_h_ | ||||||
|  | #define __khrplatform_h_ | ||||||
|  |  | ||||||
|  | /* | ||||||
|  | ** Copyright (c) 2008-2009 The Khronos Group Inc. | ||||||
|  | ** | ||||||
|  | ** Permission is hereby granted, free of charge, to any person obtaining a | ||||||
|  | ** copy of this software and/or associated documentation files (the | ||||||
|  | ** "Materials"), to deal in the Materials without restriction, including | ||||||
|  | ** without limitation the rights to use, copy, modify, merge, publish, | ||||||
|  | ** distribute, sublicense, and/or sell copies of the Materials, and to | ||||||
|  | ** permit persons to whom the Materials are furnished to do so, subject to | ||||||
|  | ** the following conditions: | ||||||
|  | ** | ||||||
|  | ** The above copyright notice and this permission notice shall be included | ||||||
|  | ** in all copies or substantial portions of the Materials. | ||||||
|  | ** | ||||||
|  | ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||||||
|  | ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||||||
|  | ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||||||
|  | ** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||||||
|  | ** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | ||||||
|  | ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||||||
|  | ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. | ||||||
|  | */ | ||||||
|  |  | ||||||
|  | /* Khronos platform-specific types and definitions. | ||||||
|  |  * | ||||||
|  |  * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ | ||||||
|  |  * | ||||||
|  |  * Adopters may modify this file to suit their platform. Adopters are | ||||||
|  |  * encouraged to submit platform specific modifications to the Khronos | ||||||
|  |  * group so that they can be included in future versions of this file. | ||||||
|  |  * Please submit changes by sending them to the public Khronos Bugzilla | ||||||
|  |  * (http://khronos.org/bugzilla) by filing a bug against product | ||||||
|  |  * "Khronos (general)" component "Registry". | ||||||
|  |  * | ||||||
|  |  * A predefined template which fills in some of the bug fields can be | ||||||
|  |  * reached using http://tinyurl.com/khrplatform-h-bugreport, but you | ||||||
|  |  * must create a Bugzilla login first. | ||||||
|  |  * | ||||||
|  |  * | ||||||
|  |  * See the Implementer's Guidelines for information about where this file | ||||||
|  |  * should be located on your system and for more details of its use: | ||||||
|  |  *    http://www.khronos.org/registry/implementers_guide.pdf | ||||||
|  |  * | ||||||
|  |  * This file should be included as | ||||||
|  |  *        #include <KHR/khrplatform.h> | ||||||
|  |  * by Khronos client API header files that use its types and defines. | ||||||
|  |  * | ||||||
|  |  * The types in khrplatform.h should only be used to define API-specific types. | ||||||
|  |  * | ||||||
|  |  * Types defined in khrplatform.h: | ||||||
|  |  *    khronos_int8_t              signed   8  bit | ||||||
|  |  *    khronos_uint8_t             unsigned 8  bit | ||||||
|  |  *    khronos_int16_t             signed   16 bit | ||||||
|  |  *    khronos_uint16_t            unsigned 16 bit | ||||||
|  |  *    khronos_int32_t             signed   32 bit | ||||||
|  |  *    khronos_uint32_t            unsigned 32 bit | ||||||
|  |  *    khronos_int64_t             signed   64 bit | ||||||
|  |  *    khronos_uint64_t            unsigned 64 bit | ||||||
|  |  *    khronos_intptr_t            signed   same number of bits as a pointer | ||||||
|  |  *    khronos_uintptr_t           unsigned same number of bits as a pointer | ||||||
|  |  *    khronos_ssize_t             signed   size | ||||||
|  |  *    khronos_usize_t             unsigned size | ||||||
|  |  *    khronos_float_t             signed   32 bit floating point | ||||||
|  |  *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds | ||||||
|  |  *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in | ||||||
|  |  *                                         nanoseconds | ||||||
|  |  *    khronos_stime_nanoseconds_t signed time interval in nanoseconds | ||||||
|  |  *    khronos_boolean_enum_t      enumerated boolean type. This should | ||||||
|  |  *      only be used as a base type when a client API's boolean type is | ||||||
|  |  *      an enum. Client APIs which use an integer or other type for | ||||||
|  |  *      booleans cannot use this as the base type for their boolean. | ||||||
|  |  * | ||||||
|  |  * Tokens defined in khrplatform.h: | ||||||
|  |  * | ||||||
|  |  *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. | ||||||
|  |  * | ||||||
|  |  *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. | ||||||
|  |  *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. | ||||||
|  |  * | ||||||
|  |  * Calling convention macros defined in this file: | ||||||
|  |  *    KHRONOS_APICALL | ||||||
|  |  *    KHRONOS_APIENTRY | ||||||
|  |  *    KHRONOS_APIATTRIBUTES | ||||||
|  |  * | ||||||
|  |  * These may be used in function prototypes as: | ||||||
|  |  * | ||||||
|  |  *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname( | ||||||
|  |  *                                  int arg1, | ||||||
|  |  *                                  int arg2) KHRONOS_APIATTRIBUTES; | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | /*------------------------------------------------------------------------- | ||||||
|  |  * Definition of KHRONOS_APICALL | ||||||
|  |  *------------------------------------------------------------------------- | ||||||
|  |  * This precedes the return type of the function in the function prototype. | ||||||
|  |  */ | ||||||
|  | #if defined(_WIN32) && !defined(__SCITECH_SNAP__) | ||||||
|  | #   define KHRONOS_APICALL __declspec(dllimport) | ||||||
|  | #elif defined (__SYMBIAN32__) | ||||||
|  | #   define KHRONOS_APICALL IMPORT_C | ||||||
|  | #else | ||||||
|  | #   define KHRONOS_APICALL | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | /*------------------------------------------------------------------------- | ||||||
|  |  * Definition of KHRONOS_APIENTRY | ||||||
|  |  *------------------------------------------------------------------------- | ||||||
|  |  * This follows the return type of the function  and precedes the function | ||||||
|  |  * name in the function prototype. | ||||||
|  |  */ | ||||||
|  | #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) | ||||||
|  |     /* Win32 but not WinCE */ | ||||||
|  | #   define KHRONOS_APIENTRY __stdcall | ||||||
|  | #else | ||||||
|  | #   define KHRONOS_APIENTRY | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | /*------------------------------------------------------------------------- | ||||||
|  |  * Definition of KHRONOS_APIATTRIBUTES | ||||||
|  |  *------------------------------------------------------------------------- | ||||||
|  |  * This follows the closing parenthesis of the function prototype arguments. | ||||||
|  |  */ | ||||||
|  | #if defined (__ARMCC_2__) | ||||||
|  | #define KHRONOS_APIATTRIBUTES __softfp | ||||||
|  | #else | ||||||
|  | #define KHRONOS_APIATTRIBUTES | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | /*------------------------------------------------------------------------- | ||||||
|  |  * basic type definitions | ||||||
|  |  *-----------------------------------------------------------------------*/ | ||||||
|  | #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Using <stdint.h> | ||||||
|  |  */ | ||||||
|  | #include <stdint.h> | ||||||
|  | typedef int32_t                 khronos_int32_t; | ||||||
|  | typedef uint32_t                khronos_uint32_t; | ||||||
|  | typedef int64_t                 khronos_int64_t; | ||||||
|  | typedef uint64_t                khronos_uint64_t; | ||||||
|  | #define KHRONOS_SUPPORT_INT64   1 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   1 | ||||||
|  |  | ||||||
|  | #elif defined(__VMS ) || defined(__sgi) | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Using <inttypes.h> | ||||||
|  |  */ | ||||||
|  | #include <inttypes.h> | ||||||
|  | typedef int32_t                 khronos_int32_t; | ||||||
|  | typedef uint32_t                khronos_uint32_t; | ||||||
|  | typedef int64_t                 khronos_int64_t; | ||||||
|  | typedef uint64_t                khronos_uint64_t; | ||||||
|  | #define KHRONOS_SUPPORT_INT64   1 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   1 | ||||||
|  |  | ||||||
|  | #elif defined(_WIN32) && !defined(__SCITECH_SNAP__) | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Win32 | ||||||
|  |  */ | ||||||
|  | typedef __int32                 khronos_int32_t; | ||||||
|  | typedef unsigned __int32        khronos_uint32_t; | ||||||
|  | typedef __int64                 khronos_int64_t; | ||||||
|  | typedef unsigned __int64        khronos_uint64_t; | ||||||
|  | #define KHRONOS_SUPPORT_INT64   1 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   1 | ||||||
|  |  | ||||||
|  | #elif defined(__sun__) || defined(__digital__) | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Sun or Digital | ||||||
|  |  */ | ||||||
|  | typedef int                     khronos_int32_t; | ||||||
|  | typedef unsigned int            khronos_uint32_t; | ||||||
|  | #if defined(__arch64__) || defined(_LP64) | ||||||
|  | typedef long int                khronos_int64_t; | ||||||
|  | typedef unsigned long int       khronos_uint64_t; | ||||||
|  | #else | ||||||
|  | typedef long long int           khronos_int64_t; | ||||||
|  | typedef unsigned long long int  khronos_uint64_t; | ||||||
|  | #endif /* __arch64__ */ | ||||||
|  | #define KHRONOS_SUPPORT_INT64   1 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   1 | ||||||
|  |  | ||||||
|  | #elif 0 | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Hypothetical platform with no float or int64 support | ||||||
|  |  */ | ||||||
|  | typedef int                     khronos_int32_t; | ||||||
|  | typedef unsigned int            khronos_uint32_t; | ||||||
|  | #define KHRONOS_SUPPORT_INT64   0 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   0 | ||||||
|  |  | ||||||
|  | #else | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Generic fallback | ||||||
|  |  */ | ||||||
|  | #include <stdint.h> | ||||||
|  | typedef int32_t                 khronos_int32_t; | ||||||
|  | typedef uint32_t                khronos_uint32_t; | ||||||
|  | typedef int64_t                 khronos_int64_t; | ||||||
|  | typedef uint64_t                khronos_uint64_t; | ||||||
|  | #define KHRONOS_SUPPORT_INT64   1 | ||||||
|  | #define KHRONOS_SUPPORT_FLOAT   1 | ||||||
|  |  | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Types that are (so far) the same on all platforms | ||||||
|  |  */ | ||||||
|  | typedef signed   char          khronos_int8_t; | ||||||
|  | typedef unsigned char          khronos_uint8_t; | ||||||
|  | typedef signed   short int     khronos_int16_t; | ||||||
|  | typedef unsigned short int     khronos_uint16_t; | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Types that differ between LLP64 and LP64 architectures - in LLP64,  | ||||||
|  |  * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears | ||||||
|  |  * to be the only LLP64 architecture in current use. | ||||||
|  |  */ | ||||||
|  | #ifdef _WIN64 | ||||||
|  | typedef signed   long long int khronos_intptr_t; | ||||||
|  | typedef unsigned long long int khronos_uintptr_t; | ||||||
|  | typedef signed   long long int khronos_ssize_t; | ||||||
|  | typedef unsigned long long int khronos_usize_t; | ||||||
|  | #else | ||||||
|  | typedef signed   long  int     khronos_intptr_t; | ||||||
|  | typedef unsigned long  int     khronos_uintptr_t; | ||||||
|  | typedef signed   long  int     khronos_ssize_t; | ||||||
|  | typedef unsigned long  int     khronos_usize_t; | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | #if KHRONOS_SUPPORT_FLOAT | ||||||
|  | /* | ||||||
|  |  * Float type | ||||||
|  |  */ | ||||||
|  | typedef          float         khronos_float_t; | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | #if KHRONOS_SUPPORT_INT64 | ||||||
|  | /* Time types | ||||||
|  |  * | ||||||
|  |  * These types can be used to represent a time interval in nanoseconds or | ||||||
|  |  * an absolute Unadjusted System Time.  Unadjusted System Time is the number | ||||||
|  |  * of nanoseconds since some arbitrary system event (e.g. since the last | ||||||
|  |  * time the system booted).  The Unadjusted System Time is an unsigned | ||||||
|  |  * 64 bit value that wraps back to 0 every 584 years.  Time intervals | ||||||
|  |  * may be either signed or unsigned. | ||||||
|  |  */ | ||||||
|  | typedef khronos_uint64_t       khronos_utime_nanoseconds_t; | ||||||
|  | typedef khronos_int64_t        khronos_stime_nanoseconds_t; | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Dummy value used to pad enum types to 32 bits. | ||||||
|  |  */ | ||||||
|  | #ifndef KHRONOS_MAX_ENUM | ||||||
|  | #define KHRONOS_MAX_ENUM 0x7FFFFFFF | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Enumerated boolean type | ||||||
|  |  * | ||||||
|  |  * Values other than zero should be considered to be true.  Therefore | ||||||
|  |  * comparisons should not be made against KHRONOS_TRUE. | ||||||
|  |  */ | ||||||
|  | typedef enum { | ||||||
|  |     KHRONOS_FALSE = 0, | ||||||
|  |     KHRONOS_TRUE  = 1, | ||||||
|  |     KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM | ||||||
|  | } khronos_boolean_enum_t; | ||||||
|  |  | ||||||
|  | #endif /* __khrplatform_h_ */ | ||||||
							
								
								
									
										2264
									
								
								externals/glad/include/glad/glad.h
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2264
									
								
								externals/glad/include/glad/glad.h
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1404
									
								
								externals/glad/src/glad.c
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1404
									
								
								externals/glad/src/glad.c
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -15,7 +15,7 @@ create_directory_groups(${SRCS} ${HEADERS}) | |||||||
|  |  | ||||||
| add_executable(citra ${SRCS} ${HEADERS}) | add_executable(citra ${SRCS} ${HEADERS}) | ||||||
| target_link_libraries(citra core video_core common) | target_link_libraries(citra core video_core common) | ||||||
| target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) | target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih glad) | ||||||
| if (MSVC) | if (MSVC) | ||||||
|     target_link_libraries(citra getopt) |     target_link_libraries(citra getopt) | ||||||
| endif() | endif() | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ | |||||||
| #include <string> | #include <string> | ||||||
|  |  | ||||||
| // Let’s use our own GL header, instead of one from GLFW. | // 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 | #define GLFW_INCLUDE_NONE | ||||||
| #include <GLFW/glfw3.h> | #include <GLFW/glfw3.h> | ||||||
|  |  | ||||||
| @@ -89,7 +89,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||||||
|         exit(1); |         exit(1); | ||||||
|     } |     } | ||||||
|     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); |     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. |     // 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_FORWARD_COMPAT, GL_TRUE); | ||||||
|     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); |     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); | ||||||
|   | |||||||
| @@ -109,7 +109,7 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : | |||||||
|  |  | ||||||
|     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose |     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose | ||||||
|     QGLFormat fmt; |     QGLFormat fmt; | ||||||
|     fmt.setVersion(3,2); |     fmt.setVersion(3,3); | ||||||
|     fmt.setProfile(QGLFormat::CoreProfile); |     fmt.setProfile(QGLFormat::CoreProfile); | ||||||
|     // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X |     // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X | ||||||
|     fmt.setOption(QGL::NoDeprecatedFunctions); |     fmt.setOption(QGL::NoDeprecatedFunctions); | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| set(SRCS | set(SRCS | ||||||
|             renderer_opengl/generated/gl_3_2_core.c |  | ||||||
|             renderer_opengl/gl_rasterizer.cpp |             renderer_opengl/gl_rasterizer.cpp | ||||||
|             renderer_opengl/gl_rasterizer_cache.cpp |             renderer_opengl/gl_rasterizer_cache.cpp | ||||||
|             renderer_opengl/gl_shader_util.cpp |             renderer_opengl/gl_shader_util.cpp | ||||||
| @@ -19,7 +18,6 @@ set(SRCS | |||||||
|  |  | ||||||
| set(HEADERS | set(HEADERS | ||||||
|             debug_utils/debug_utils.h |             debug_utils/debug_utils.h | ||||||
|             renderer_opengl/generated/gl_3_2_core.h |  | ||||||
|             renderer_opengl/gl_rasterizer.h |             renderer_opengl/gl_rasterizer.h | ||||||
|             renderer_opengl/gl_rasterizer_cache.h |             renderer_opengl/gl_rasterizer_cache.h | ||||||
|             renderer_opengl/gl_resource_manager.h |             renderer_opengl/gl_resource_manager.h | ||||||
| @@ -53,6 +51,7 @@ endif() | |||||||
| create_directory_groups(${SRCS} ${HEADERS}) | create_directory_groups(${SRCS} ${HEADERS}) | ||||||
|  |  | ||||||
| add_library(video_core STATIC ${SRCS} ${HEADERS}) | add_library(video_core STATIC ${SRCS} ${HEADERS}) | ||||||
|  | target_link_libraries(video_core glad) | ||||||
|  |  | ||||||
| if (PNG_FOUND) | if (PNG_FOUND) | ||||||
|     target_link_libraries(video_core ${PNG_LIBRARIES}) |     target_link_libraries(video_core ${PNG_LIBRARIES}) | ||||||
|   | |||||||
| @@ -1,5 +0,0 @@ | |||||||
| These file were generated by the [glLoadGen](https://bitbucket.org/alfonse/glloadgen/wiki/Home) OpenGL loader generator and have been checked in as-is. You can re-generate them using version 2.0.2 of glLoadGen and executing the following command: |  | ||||||
|  |  | ||||||
| ``` |  | ||||||
| lua LoadGen.lua -version 3.2 -profile core -indent space 3_2_core |  | ||||||
| ``` |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -5,6 +5,8 @@ | |||||||
| #include <cstring> | #include <cstring> | ||||||
| #include <memory> | #include <memory> | ||||||
|  |  | ||||||
|  | #include <glad/glad.h> | ||||||
|  |  | ||||||
| #include "common/color.h" | #include "common/color.h" | ||||||
| #include "common/math_util.h" | #include "common/math_util.h" | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| @@ -21,8 +23,6 @@ | |||||||
| #include "video_core/renderer_opengl/gl_shader_util.h" | #include "video_core/renderer_opengl/gl_shader_util.h" | ||||||
| #include "video_core/renderer_opengl/pica_to_gl.h" | #include "video_core/renderer_opengl/pica_to_gl.h" | ||||||
|  |  | ||||||
| #include "generated/gl_3_2_core.h" |  | ||||||
|  |  | ||||||
| static bool IsPassThroughTevStage(const Pica::Regs::TevStageConfig& stage) { | static bool IsPassThroughTevStage(const Pica::Regs::TevStageConfig& stage) { | ||||||
|     return (stage.color_op == Pica::Regs::TevStageConfig::Operation::Replace && |     return (stage.color_op == Pica::Regs::TevStageConfig::Operation::Replace && | ||||||
|             stage.alpha_op == Pica::Regs::TevStageConfig::Operation::Replace && |             stage.alpha_op == Pica::Regs::TevStageConfig::Operation::Replace && | ||||||
|   | |||||||
| @@ -6,9 +6,10 @@ | |||||||
|  |  | ||||||
| #include <utility> | #include <utility> | ||||||
|  |  | ||||||
|  | #include <glad/glad.h> | ||||||
|  |  | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
|  |  | ||||||
| #include "video_core/renderer_opengl/generated/gl_3_2_core.h" |  | ||||||
| #include "video_core/renderer_opengl/gl_shader_util.h" | #include "video_core/renderer_opengl/gl_shader_util.h" | ||||||
| #include "video_core/renderer_opengl/gl_state.h" | #include "video_core/renderer_opengl/gl_state.h" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include "generated/gl_3_2_core.h" | #include <glad/glad.h> | ||||||
|  |  | ||||||
| namespace ShaderUtil { | namespace ShaderUtil { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include "generated/gl_3_2_core.h" | #include <glad/glad.h> | ||||||
|  |  | ||||||
| class OpenGLState { | class OpenGLState { | ||||||
| public: | public: | ||||||
|   | |||||||
| @@ -4,12 +4,12 @@ | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
|  | #include <glad/glad.h> | ||||||
|  |  | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
|  |  | ||||||
| #include "video_core/pica.h" | #include "video_core/pica.h" | ||||||
|  |  | ||||||
| #include "generated/gl_3_2_core.h" |  | ||||||
|  |  | ||||||
| namespace PicaToGL { | namespace PicaToGL { | ||||||
|  |  | ||||||
| inline GLenum TextureFilterMode(Pica::Regs::TextureConfig::TextureFilter mode) { | inline GLenum TextureFilterMode(Pica::Regs::TextureConfig::TextureFilter mode) { | ||||||
|   | |||||||
| @@ -373,8 +373,8 @@ void RendererOpenGL::SetWindow(EmuWindow* window) { | |||||||
| void RendererOpenGL::Init() { | void RendererOpenGL::Init() { | ||||||
|     render_window->MakeCurrent(); |     render_window->MakeCurrent(); | ||||||
|  |  | ||||||
|     int err = ogl_LoadFunctions(); |     // TODO: Make frontends initialize this, so they can use gladLoadGLLoader with their own loaders | ||||||
|     if (ogl_LOAD_SUCCEEDED != err) { |     if (!gladLoadGL()) { | ||||||
|         LOG_CRITICAL(Render_OpenGL, "Failed to initialize GL functions! Exiting..."); |         LOG_CRITICAL(Render_OpenGL, "Failed to initialize GL functions! Exiting..."); | ||||||
|         exit(-1); |         exit(-1); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ | |||||||
|  |  | ||||||
| #include <array> | #include <array> | ||||||
|  |  | ||||||
| #include "generated/gl_3_2_core.h" | #include <glad/glad.h> | ||||||
|  |  | ||||||
| #include "common/math_util.h" | #include "common/math_util.h" | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user