mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Merge pull request #2505 from ReinUsesLisp/glad-update
externals: Update glad to support OpenGL 4.6 compatibility profile
This commit is contained in:
		
						commit
						c70404eab5
					
				
							
								
								
									
										12
									
								
								externals/glad/include/KHR/khrplatform.h
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								externals/glad/include/KHR/khrplatform.h
									
									
									
									
										vendored
									
									
								
							| @ -90,12 +90,20 @@ | |||||||
|  *                                  int arg2) KHRONOS_APIATTRIBUTES; |  *                                  int arg2) KHRONOS_APIATTRIBUTES; | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
|  | #if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) | ||||||
|  | #   define KHRONOS_STATIC 1 | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| /*-------------------------------------------------------------------------
 | /*-------------------------------------------------------------------------
 | ||||||
|  * Definition of KHRONOS_APICALL |  * Definition of KHRONOS_APICALL | ||||||
|  *------------------------------------------------------------------------- |  *------------------------------------------------------------------------- | ||||||
|  * This precedes the return type of the function in the function prototype. |  * This precedes the return type of the function in the function prototype. | ||||||
|  */ |  */ | ||||||
| #if defined(_WIN32) && !defined(__SCITECH_SNAP__) | #if defined(KHRONOS_STATIC) | ||||||
|  |     /* If the preprocessor constant KHRONOS_STATIC is defined, make the
 | ||||||
|  |      * header compatible with static linking. */ | ||||||
|  | #   define KHRONOS_APICALL | ||||||
|  | #elif defined(_WIN32) | ||||||
| #   define KHRONOS_APICALL __declspec(dllimport) | #   define KHRONOS_APICALL __declspec(dllimport) | ||||||
| #elif defined (__SYMBIAN32__) | #elif defined (__SYMBIAN32__) | ||||||
| #   define KHRONOS_APICALL IMPORT_C | #   define KHRONOS_APICALL IMPORT_C | ||||||
| @ -111,7 +119,7 @@ | |||||||
|  * This follows the return type of the function  and precedes the function |  * This follows the return type of the function  and precedes the function | ||||||
|  * name in the function prototype. |  * name in the function prototype. | ||||||
|  */ |  */ | ||||||
| #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) | #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC) | ||||||
|     /* Win32 but not WinCE */ |     /* Win32 but not WinCE */ | ||||||
| #   define KHRONOS_APIENTRY __stdcall | #   define KHRONOS_APIENTRY __stdcall | ||||||
| #else | #else | ||||||
|  | |||||||
							
								
								
									
										2388
									
								
								externals/glad/include/glad/glad.h
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2388
									
								
								externals/glad/include/glad/glad.h
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1125
									
								
								externals/glad/src/glad.c
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1125
									
								
								externals/glad/src/glad.c
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user
	 bunnei
						bunnei