diff options
| author | Ilia Mirkin <[email protected]> | 2016-08-28 13:07:25 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2016-08-28 21:41:47 -0400 |
| commit | 6a5504de2fbc43b445406324485629a313f7e542 (patch) | |
| tree | 4ffc1742b9366da249e99b8c2358a47f4b259a15 /include/GL/glext.h | |
| parent | d49a231c330df1ed596137bdd2a3d69fcc99d48e (diff) | |
Update Khronos-supplied headers to r33100
As retrieved from opengl.org and khronos.org. Maintained the APPLE hack
in GL/glext.h manually. Added gl32.h.
Signed-off-by: Ilia Mirkin <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Diffstat (limited to 'include/GL/glext.h')
| -rw-r--r-- | include/GL/glext.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/GL/glext.h b/include/GL/glext.h index 811af0d949b..47535756f16 100644 --- a/include/GL/glext.h +++ b/include/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: 32957 $ on $Date: 2016-06-09 17:03:08 -0400 (Thu, 09 Jun 2016) $ +** Khronos $Revision: 33061 $ on $Date: 2016-07-14 20:14:13 -0400 (Thu, 14 Jul 2016) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -53,7 +53,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20160609 +#define GL_GLEXT_VERSION 20160714 /* Generated C header for: * API: gl @@ -8836,6 +8836,11 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG #define GL_INTERLACE_READ_INGR 0x8568 #endif /* GL_INGR_interlace_read */ +#ifndef GL_INTEL_conservative_rasterization +#define GL_INTEL_conservative_rasterization 1 +#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE +#endif /* GL_INTEL_conservative_rasterization */ + #ifndef GL_INTEL_fragment_shader_ordering #define GL_INTEL_fragment_shader_ordering 1 #endif /* GL_INTEL_fragment_shader_ordering */ |