diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 23:23:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 23:23:44 +0200 |
| commit | 26287ff521b55de188c7b41eee4bff389844c6c3 (patch) | |
| tree | 545263de6a5c314743d0b818bf6a942bae9909e3 /gl | |
| parent | 24fb0da18f1c44dfa1f76d8cde8efbb958aa7659 (diff) | |
| download | vcxsrv-26287ff521b55de188c7b41eee4bff389844c6c3.tar.gz vcxsrv-26287ff521b55de188c7b41eee4bff389844c6c3.tar.bz2 vcxsrv-26287ff521b55de188c7b41eee4bff389844c6c3.zip | |
Solved compile problems due to latest merge
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/glext.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gl/glext.h b/gl/glext.h index 7ea5a0d4d..a626580bc 100644 --- a/gl/glext.h +++ b/gl/glext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 25406 $ on $Date: 2014-02-18 16:34:26 -0800 (Tue, 18 Feb 2014) $ +** Khronos $Revision: 25853 $ on $Date: 2014-03-13 03:40:45 -0700 (Thu, 13 Mar 2014) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -53,7 +53,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20140218 +#define GL_GLEXT_VERSION 20140313 /* Generated C header for: * API: gl @@ -7080,6 +7080,10 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin #define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA #endif /* GL_EXT_separate_specular_color */ +#ifndef GL_EXT_shader_image_load_formatted +#define GL_EXT_shader_image_load_formatted 1 +#endif /* GL_EXT_shader_image_load_formatted */ + #ifndef GL_EXT_shader_image_load_store #define GL_EXT_shader_image_load_store 1 #define GL_MAX_IMAGE_UNITS_EXT 0x8F38 @@ -9427,6 +9431,17 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs #define GL_NV_shader_storage_buffer_object 1 #endif /* GL_NV_shader_storage_buffer_object */ +#ifndef GL_NV_shader_thread_group +#define GL_NV_shader_thread_group 1 +#define GL_WARP_SIZE_NV 0x9339 +#define GL_WARPS_PER_SM_NV 0x933A +#define GL_SM_COUNT_NV 0x933B +#endif /* GL_NV_shader_thread_group */ + +#ifndef GL_NV_shader_thread_shuffle +#define GL_NV_shader_thread_shuffle 1 +#endif /* GL_NV_shader_thread_shuffle */ + #ifndef GL_NV_tessellation_program5 #define GL_NV_tessellation_program5 1 #define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 |