SDL_opengles2: Update to latest Khronos headers.
This updates to the latest Khronos headers, which gives the latest
headers for MSVC.
The following files were retrieved on 2014-06-04:
http://www.khronos.org/registry/gles/api/GLES2/gl2.h
http://www.khronos.org/registry/gles/api/GLES2/gl2ext.h
http://www.khronos.org/registry/gles/api/GLES2/gl2platform.h
http://www.khronos.org/registry/egl/api/KHR/khrplatform.h
And they were modified to not include each other themselves.
1.1 --- a/include/SDL_opengles2_gl2.h Wed Jun 04 01:32:52 2014 -0700
1.2 +++ b/include/SDL_opengles2_gl2.h Wed Jun 04 01:35:36 2014 -0700
1.3 @@ -1,7 +1,7 @@
1.4 #ifndef __gl2_h_
1.5 #define __gl2_h_
1.6
1.7 -/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */
1.8 +/* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */
1.9
1.10 /*#include <GLES2/gl2platform.h>*/
1.11
1.12 @@ -527,7 +527,7 @@
1.13 GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
1.14 GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
1.15 GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
1.16 -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
1.17 +GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
1.18 GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
1.19 GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
1.20 GL_APICALL GLenum GL_APIENTRY glGetError (void);
1.21 @@ -546,7 +546,7 @@
1.22 GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
1.23 GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
1.24 GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
1.25 -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
1.26 +GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
1.27 GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
1.28 GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
1.29 GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
2.1 --- a/include/SDL_opengles2_gl2ext.h Wed Jun 04 01:32:52 2014 -0700
2.2 +++ b/include/SDL_opengles2_gl2ext.h Wed Jun 04 01:35:36 2014 -0700
2.3 @@ -1,7 +1,7 @@
2.4 #ifndef __gl2ext_h_
2.5 #define __gl2ext_h_
2.6
2.7 -/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */
2.8 +/* $Revision: 22801 $ on $Date:: 2013-08-21 03:20:48 -0700 #$ */
2.9
2.10 #ifdef __cplusplus
2.11 extern "C" {
2.12 @@ -16,6 +16,20 @@
2.13 # define GL_APIENTRYP GL_APIENTRY*
2.14 #endif
2.15
2.16 +/* New types shared by several extensions */
2.17 +
2.18 +#ifndef __gl3_h_
2.19 +/* These are defined with respect to <inttypes.h> in the
2.20 + * Apple extension spec, but they are also used by non-APPLE
2.21 + * extensions, and in the Khronos header we use the Khronos
2.22 + * portable types in khrplatform.h, which must be defined.
2.23 + */
2.24 +typedef khronos_int64_t GLint64;
2.25 +typedef khronos_uint64_t GLuint64;
2.26 +typedef struct __GLsync *GLsync;
2.27 +#endif
2.28 +
2.29 +
2.30 /*------------------------------------------------------------------------*
2.31 * OES extension tokens
2.32 *------------------------------------------------------------------------*/
2.33 @@ -94,23 +108,23 @@
2.34 #endif
2.35
2.36 /* GL_OES_required_internalformat */
2.37 -#ifndef GL_OES_required_internalformat
2.38 +#ifndef GL_OES_required_internalformat
2.39 #define GL_ALPHA8_OES 0x803C
2.40 #define GL_DEPTH_COMPONENT16_OES 0x81A5
2.41 -/* reuse GL_DEPTH_COMPONENT24_OES */
2.42 -/* reuse GL_DEPTH24_STENCIL8_OES */
2.43 -/* reuse GL_DEPTH_COMPONENT32_OES */
2.44 +/* reuse GL_DEPTH_COMPONENT24_OES */
2.45 +/* reuse GL_DEPTH24_STENCIL8_OES */
2.46 +/* reuse GL_DEPTH_COMPONENT32_OES */
2.47 #define GL_LUMINANCE4_ALPHA4_OES 0x8043
2.48 #define GL_LUMINANCE8_ALPHA8_OES 0x8045
2.49 #define GL_LUMINANCE8_OES 0x8040
2.50 #define GL_RGBA4_OES 0x8056
2.51 #define GL_RGB5_A1_OES 0x8057
2.52 #define GL_RGB565_OES 0x8D62
2.53 -/* reuse GL_RGB8_OES */
2.54 -/* reuse GL_RGBA8_OES */
2.55 +/* reuse GL_RGB8_OES */
2.56 +/* reuse GL_RGBA8_OES */
2.57 /* reuse GL_RGB10_EXT */
2.58 /* reuse GL_RGB10_A2_EXT */
2.59 -#endif
2.60 +#endif
2.61
2.62 /* GL_OES_rgb8_rgba8 */
2.63 #ifndef GL_OES_rgb8_rgba8
2.64 @@ -183,47 +197,47 @@
2.65 *------------------------------------------------------------------------*/
2.66
2.67 #ifndef GL_KHR_debug
2.68 -typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
2.69 -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
2.70 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
2.71 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
2.72 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
2.73 -#define GL_DEBUG_SOURCE_API 0x8246
2.74 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
2.75 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
2.76 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
2.77 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A
2.78 -#define GL_DEBUG_SOURCE_OTHER 0x824B
2.79 -#define GL_DEBUG_TYPE_ERROR 0x824C
2.80 -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
2.81 -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
2.82 -#define GL_DEBUG_TYPE_PORTABILITY 0x824F
2.83 -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
2.84 -#define GL_DEBUG_TYPE_OTHER 0x8251
2.85 -#define GL_DEBUG_TYPE_MARKER 0x8268
2.86 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
2.87 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A
2.88 -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
2.89 -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
2.90 -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D
2.91 -#define GL_BUFFER 0x82E0
2.92 -#define GL_SHADER 0x82E1
2.93 -#define GL_PROGRAM 0x82E2
2.94 -#define GL_QUERY 0x82E3
2.95 -/* PROGRAM_PIPELINE only in GL */
2.96 -#define GL_SAMPLER 0x82E6
2.97 -/* DISPLAY_LIST only in GL */
2.98 -#define GL_MAX_LABEL_LENGTH 0x82E8
2.99 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
2.100 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
2.101 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145
2.102 -#define GL_DEBUG_SEVERITY_HIGH 0x9146
2.103 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
2.104 -#define GL_DEBUG_SEVERITY_LOW 0x9148
2.105 -#define GL_DEBUG_OUTPUT 0x92E0
2.106 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002
2.107 -#define GL_STACK_OVERFLOW 0x0503
2.108 -#define GL_STACK_UNDERFLOW 0x0504
2.109 +typedef void (GL_APIENTRYP GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
2.110 +#define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242
2.111 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243
2.112 +#define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244
2.113 +#define GL_DEBUG_CALLBACK_USER_PARAM_KHR 0x8245
2.114 +#define GL_DEBUG_SOURCE_API_KHR 0x8246
2.115 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR 0x8247
2.116 +#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR 0x8248
2.117 +#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR 0x8249
2.118 +#define GL_DEBUG_SOURCE_APPLICATION_KHR 0x824A
2.119 +#define GL_DEBUG_SOURCE_OTHER_KHR 0x824B
2.120 +#define GL_DEBUG_TYPE_ERROR_KHR 0x824C
2.121 +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR 0x824D
2.122 +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR 0x824E
2.123 +#define GL_DEBUG_TYPE_PORTABILITY_KHR 0x824F
2.124 +#define GL_DEBUG_TYPE_PERFORMANCE_KHR 0x8250
2.125 +#define GL_DEBUG_TYPE_OTHER_KHR 0x8251
2.126 +#define GL_DEBUG_TYPE_MARKER_KHR 0x8268
2.127 +#define GL_DEBUG_TYPE_PUSH_GROUP_KHR 0x8269
2.128 +#define GL_DEBUG_TYPE_POP_GROUP_KHR 0x826A
2.129 +#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR 0x826B
2.130 +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR 0x826C
2.131 +#define GL_DEBUG_GROUP_STACK_DEPTH_KHR 0x826D
2.132 +#define GL_BUFFER_KHR 0x82E0
2.133 +#define GL_SHADER_KHR 0x82E1
2.134 +#define GL_PROGRAM_KHR 0x82E2
2.135 +#define GL_QUERY_KHR 0x82E3
2.136 +/* PROGRAM_PIPELINE only in GL */
2.137 +#define GL_SAMPLER_KHR 0x82E6
2.138 +/* DISPLAY_LIST only in GL */
2.139 +#define GL_MAX_LABEL_LENGTH_KHR 0x82E8
2.140 +#define GL_MAX_DEBUG_MESSAGE_LENGTH_KHR 0x9143
2.141 +#define GL_MAX_DEBUG_LOGGED_MESSAGES_KHR 0x9144
2.142 +#define GL_DEBUG_LOGGED_MESSAGES_KHR 0x9145
2.143 +#define GL_DEBUG_SEVERITY_HIGH_KHR 0x9146
2.144 +#define GL_DEBUG_SEVERITY_MEDIUM_KHR 0x9147
2.145 +#define GL_DEBUG_SEVERITY_LOW_KHR 0x9148
2.146 +#define GL_DEBUG_OUTPUT_KHR 0x92E0
2.147 +#define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002
2.148 +#define GL_STACK_OVERFLOW_KHR 0x0503
2.149 +#define GL_STACK_UNDERFLOW_KHR 0x0504
2.150 #endif
2.151
2.152 #ifndef GL_KHR_texture_compression_astc_ldr
2.153 @@ -294,6 +308,18 @@
2.154 * ANGLE extension tokens
2.155 *------------------------------------------------------------------------*/
2.156
2.157 +/* GL_ANGLE_depth_texture */
2.158 +#ifndef GL_ANGLE_depth_texture
2.159 +#define GL_DEPTH_COMPONENT 0x1902
2.160 +#define GL_DEPTH_STENCIL_OES 0x84F9
2.161 +#define GL_UNSIGNED_SHORT 0x1403
2.162 +#define GL_UNSIGNED_INT 0x1405
2.163 +#define GL_UNSIGNED_INT_24_8_OES 0x84FA
2.164 +#define GL_DEPTH_COMPONENT16 0x81A5
2.165 +#define GL_DEPTH_COMPONENT32_OES 0x81A7
2.166 +#define GL_DEPTH24_STENCIL8_OES 0x88F0
2.167 +#endif
2.168 +
2.169 /* GL_ANGLE_framebuffer_blit */
2.170 #ifndef GL_ANGLE_framebuffer_blit
2.171 #define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8
2.172 @@ -310,33 +336,38 @@
2.173 #endif
2.174
2.175 /* GL_ANGLE_instanced_arrays */
2.176 -#ifndef GL_ANGLE_instanced_arrays
2.177 +#ifndef GL_ANGLE_instanced_arrays
2.178 #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE
2.179 #endif
2.180
2.181 /* GL_ANGLE_pack_reverse_row_order */
2.182 -#ifndef GL_ANGLE_pack_reverse_row_order
2.183 +#ifndef GL_ANGLE_pack_reverse_row_order
2.184 #define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4
2.185 #endif
2.186
2.187 +/* GL_ANGLE_program_binary */
2.188 +#ifndef GL_ANGLE_program_binary
2.189 +#define GL_PROGRAM_BINARY_ANGLE 0x93A6
2.190 +#endif
2.191 +
2.192 /* GL_ANGLE_texture_compression_dxt3 */
2.193 -#ifndef GL_ANGLE_texture_compression_dxt3
2.194 +#ifndef GL_ANGLE_texture_compression_dxt3
2.195 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2
2.196 #endif
2.197
2.198 /* GL_ANGLE_texture_compression_dxt5 */
2.199 -#ifndef GL_ANGLE_texture_compression_dxt5
2.200 +#ifndef GL_ANGLE_texture_compression_dxt5
2.201 #define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3
2.202 #endif
2.203
2.204 /* GL_ANGLE_texture_usage */
2.205 -#ifndef GL_ANGLE_texture_usage
2.206 +#ifndef GL_ANGLE_texture_usage
2.207 #define GL_TEXTURE_USAGE_ANGLE 0x93A2
2.208 #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3
2.209 #endif
2.210
2.211 /* GL_ANGLE_translated_shader_source */
2.212 -#ifndef GL_ANGLE_translated_shader_source
2.213 +#ifndef GL_ANGLE_translated_shader_source
2.214 #define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0
2.215 #endif
2.216
2.217 @@ -346,7 +377,7 @@
2.218
2.219 /* GL_APPLE_copy_texture_levels */
2.220 /* No new tokens introduced by this extension. */
2.221 -
2.222 +
2.223 /* GL_APPLE_framebuffer_multisample */
2.224 #ifndef GL_APPLE_framebuffer_multisample
2.225 #define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB
2.226 @@ -368,19 +399,6 @@
2.227 /* GL_APPLE_sync */
2.228 #ifndef GL_APPLE_sync
2.229
2.230 -#ifndef __gl3_h_
2.231 -/* These types are defined with reference to <inttypes.h>
2.232 - * in the Apple extension spec, but here we use the Khronos
2.233 - * portable types in khrplatform.h, and assume those types
2.234 - * are always defined.
2.235 - * If any other extensions using these types are defined,
2.236 - * the typedefs must move out of this block and be shared.
2.237 - */
2.238 -typedef khronos_int64_t GLint64;
2.239 -typedef khronos_uint64_t GLuint64;
2.240 -typedef struct __GLsync *GLsync;
2.241 -#endif
2.242 -
2.243 #define GL_SYNC_OBJECT_APPLE 0x8A53
2.244 #define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111
2.245 #define GL_OBJECT_TYPE_APPLE 0x9112
2.246 @@ -466,6 +484,54 @@
2.247 #define GL_STENCIL_EXT 0x1802
2.248 #endif
2.249
2.250 +#ifndef GL_EXT_disjoint_timer_query
2.251 +#define GL_QUERY_COUNTER_BITS_EXT 0x8864
2.252 +#define GL_CURRENT_QUERY_EXT 0x8865
2.253 +#define GL_QUERY_RESULT_EXT 0x8866
2.254 +#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867
2.255 +#define GL_TIME_ELAPSED_EXT 0x88BF
2.256 +#define GL_TIMESTAMP_EXT 0x8E28
2.257 +#define GL_GPU_DISJOINT_EXT 0x8FBB
2.258 +#endif
2.259 +
2.260 +#ifndef GL_EXT_draw_buffers
2.261 +#define GL_EXT_draw_buffers 1
2.262 +#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
2.263 +#define GL_MAX_DRAW_BUFFERS_EXT 0x8824
2.264 +#define GL_DRAW_BUFFER0_EXT 0x8825
2.265 +#define GL_DRAW_BUFFER1_EXT 0x8826
2.266 +#define GL_DRAW_BUFFER2_EXT 0x8827
2.267 +#define GL_DRAW_BUFFER3_EXT 0x8828
2.268 +#define GL_DRAW_BUFFER4_EXT 0x8829
2.269 +#define GL_DRAW_BUFFER5_EXT 0x882A
2.270 +#define GL_DRAW_BUFFER6_EXT 0x882B
2.271 +#define GL_DRAW_BUFFER7_EXT 0x882C
2.272 +#define GL_DRAW_BUFFER8_EXT 0x882D
2.273 +#define GL_DRAW_BUFFER9_EXT 0x882E
2.274 +#define GL_DRAW_BUFFER10_EXT 0x882F
2.275 +#define GL_DRAW_BUFFER11_EXT 0x8830
2.276 +#define GL_DRAW_BUFFER12_EXT 0x8831
2.277 +#define GL_DRAW_BUFFER13_EXT 0x8832
2.278 +#define GL_DRAW_BUFFER14_EXT 0x8833
2.279 +#define GL_DRAW_BUFFER15_EXT 0x8834
2.280 +#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
2.281 +#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
2.282 +#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
2.283 +#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
2.284 +#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
2.285 +#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
2.286 +#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
2.287 +#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
2.288 +#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
2.289 +#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
2.290 +#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
2.291 +#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
2.292 +#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
2.293 +#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
2.294 +#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
2.295 +#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
2.296 +#endif
2.297 +
2.298 /* GL_EXT_map_buffer_range */
2.299 #ifndef GL_EXT_map_buffer_range
2.300 #define GL_MAP_READ_BIT_EXT 0x0001
2.301 @@ -479,7 +545,7 @@
2.302 /* GL_EXT_multisampled_render_to_texture */
2.303 #ifndef GL_EXT_multisampled_render_to_texture
2.304 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C
2.305 -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */
2.306 +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */
2.307 #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
2.308 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
2.309 #define GL_MAX_SAMPLES_EXT 0x8D57
2.310 @@ -559,6 +625,12 @@
2.311 #define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210
2.312 #endif
2.313
2.314 +/* GL_EXT_sRGB_write_control */
2.315 +#ifndef GL_EXT_sRGB_write_control
2.316 +#define GL_EXT_sRGB_write_control 1
2.317 +#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9
2.318 +#endif
2.319 +
2.320 /* GL_EXT_texture_compression_dxt1 */
2.321 #ifndef GL_EXT_texture_compression_dxt1
2.322 #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
2.323 @@ -584,13 +656,21 @@
2.324 #define GL_RG8_EXT 0x822B
2.325 #endif
2.326
2.327 +/* GL_EXT_texture_sRGB_decode */
2.328 +#ifndef GL_EXT_texture_sRGB_decode
2.329 +#define GL_EXT_texture_sRGB_decode 1
2.330 +#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
2.331 +#define GL_DECODE_EXT 0x8A49
2.332 +#define GL_SKIP_DECODE_EXT 0x8A4A
2.333 +#endif
2.334 +
2.335 /* GL_EXT_texture_storage */
2.336 #ifndef GL_EXT_texture_storage
2.337 #define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F
2.338 -#define GL_ALPHA8_EXT 0x803C
2.339 +#define GL_ALPHA8_EXT 0x803C
2.340 #define GL_LUMINANCE8_EXT 0x8040
2.341 #define GL_LUMINANCE8_ALPHA8_EXT 0x8045
2.342 -#define GL_RGBA32F_EXT 0x8814
2.343 +#define GL_RGBA32F_EXT 0x8814
2.344 #define GL_RGB32F_EXT 0x8815
2.345 #define GL_ALPHA32F_EXT 0x8816
2.346 #define GL_LUMINANCE32F_EXT 0x8818
2.347 @@ -600,12 +680,12 @@
2.348 #define GL_ALPHA16F_EXT 0x881C
2.349 #define GL_LUMINANCE16F_EXT 0x881E
2.350 #define GL_LUMINANCE_ALPHA16F_EXT 0x881F
2.351 -#define GL_RGB10_A2_EXT 0x8059
2.352 +#define GL_RGB10_A2_EXT 0x8059
2.353 #define GL_RGB10_EXT 0x8052
2.354 #define GL_BGRA8_EXT 0x93A1
2.355 #define GL_R8_EXT 0x8229
2.356 #define GL_RG8_EXT 0x822B
2.357 -#define GL_R32F_EXT 0x822E
2.358 +#define GL_R32F_EXT 0x822E
2.359 #define GL_RG32F_EXT 0x8230
2.360 #define GL_R16F_EXT 0x822D
2.361 #define GL_RG16F_EXT 0x822F
2.362 @@ -618,9 +698,9 @@
2.363
2.364 /* GL_EXT_unpack_subimage */
2.365 #ifndef GL_EXT_unpack_subimage
2.366 -#define GL_UNPACK_ROW_LENGTH 0x0CF2
2.367 -#define GL_UNPACK_SKIP_ROWS 0x0CF3
2.368 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4
2.369 +#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2
2.370 +#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3
2.371 +#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4
2.372 #endif
2.373
2.374 /*------------------------------------------------------------------------*
2.375 @@ -638,7 +718,7 @@
2.376
2.377 /* GL_FJ_shader_binary_GCCSO */
2.378 #ifndef GL_FJ_shader_binary_GCCSO
2.379 -#define GCCSO_SHADER_BINARY_FJ 0x9260
2.380 +#define GL_GCCSO_SHADER_BINARY_FJ 0x9260
2.381 #endif
2.382
2.383 /*------------------------------------------------------------------------*
2.384 @@ -669,6 +749,12 @@
2.385 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
2.386 #endif
2.387
2.388 +/* GL_IMG_texture_compression_pvrtc2 */
2.389 +#ifndef GL_IMG_texture_compression_pvrtc2
2.390 +#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137
2.391 +#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138
2.392 +#endif
2.393 +
2.394 /* GL_IMG_multisampled_render_to_texture */
2.395 #ifndef GL_IMG_multisampled_render_to_texture
2.396 #define GL_RENDERBUFFER_SAMPLES_IMG 0x9133
2.397 @@ -691,7 +777,7 @@
2.398 #define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5
2.399 #define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6
2.400 #define GL_COVERAGE_AUTOMATIC_NV 0x8ED7
2.401 -#define GL_COVERAGE_BUFFER_BIT_NV 0x8000
2.402 +#define GL_COVERAGE_BUFFER_BIT_NV 0x00008000
2.403 #endif
2.404
2.405 /* GL_NV_depth_nonlinear */
2.406 @@ -736,6 +822,9 @@
2.407 #define GL_COLOR_ATTACHMENT15_NV 0x8CEF
2.408 #endif
2.409
2.410 +/* GL_NV_draw_instanced */
2.411 +/* No new tokens introduced by this extension. */
2.412 +
2.413 /* GL_NV_fbo_color_attachments */
2.414 #ifndef GL_NV_fbo_color_attachments
2.415 #define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF
2.416 @@ -749,6 +838,29 @@
2.417 #define GL_FENCE_CONDITION_NV 0x84F4
2.418 #endif
2.419
2.420 +/* GL_NV_framebuffer_blit */
2.421 +#ifndef GL_NV_framebuffer_blit
2.422 +#define GL_READ_FRAMEBUFFER_NV 0x8CA8
2.423 +#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9
2.424 +#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6
2.425 +#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA
2.426 +#endif
2.427 +
2.428 +/* GL_NV_framebuffer_multisample */
2.429 +#ifndef GL_NV_framebuffer_multisample
2.430 +#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB
2.431 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56
2.432 +#define GL_MAX_SAMPLES_NV 0x8D57
2.433 +#endif
2.434 +
2.435 +/* GL_NV_generate_mipmap_sRGB */
2.436 +/* No new tokens introduced by this extension. */
2.437 +
2.438 +/* GL_NV_instanced_arrays */
2.439 +#ifndef GL_NV_instanced_arrays
2.440 +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE
2.441 +#endif
2.442 +
2.443 /* GL_NV_read_buffer */
2.444 #ifndef GL_NV_read_buffer
2.445 #define GL_READ_BUFFER_NV 0x0C02
2.446 @@ -766,6 +878,36 @@
2.447 /* GL_NV_read_stencil */
2.448 /* No new tokens introduced by this extension. */
2.449
2.450 +/* GL_NV_shadow_samplers_array */
2.451 +#ifndef GL_NV_shadow_samplers_array
2.452 +#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4
2.453 +#endif
2.454 +
2.455 +/* GL_NV_shadow_samplers_cube */
2.456 +#ifndef GL_NV_shadow_samplers_cube
2.457 +#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5
2.458 +#endif
2.459 +
2.460 +/* GL_NV_sRGB_formats */
2.461 +#ifndef GL_NV_sRGB_formats
2.462 +#define GL_SLUMINANCE_NV 0x8C46
2.463 +#define GL_SLUMINANCE_ALPHA_NV 0x8C44
2.464 +#define GL_SRGB8_NV 0x8C41
2.465 +#define GL_SLUMINANCE8_NV 0x8C47
2.466 +#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45
2.467 +#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C
2.468 +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D
2.469 +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E
2.470 +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F
2.471 +#define GL_ETC1_SRGB8_NV 0x88EE
2.472 +#endif
2.473 +
2.474 +/* GL_NV_texture_border_clamp */
2.475 +#ifndef GL_NV_texture_border_clamp
2.476 +#define GL_TEXTURE_BORDER_COLOR_NV 0x1004
2.477 +#define GL_CLAMP_TO_BORDER_NV 0x812D
2.478 +#endif
2.479 +
2.480 /* GL_NV_texture_compression_s3tc_update */
2.481 /* No new tokens introduced by this extension. */
2.482
2.483 @@ -949,11 +1091,11 @@
2.484 #ifdef GL_GLEXT_PROTOTYPES
2.485 GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
2.486 GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
2.487 -GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params);
2.488 +GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid **params);
2.489 #endif
2.490 typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
2.491 typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
2.492 -typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params);
2.493 +typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid **params);
2.494 #endif
2.495
2.496 /* GL_OES_packed_depth_stencil */
2.497 @@ -1006,7 +1148,7 @@
2.498 typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
2.499 typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
2.500 typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
2.501 -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
2.502 +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
2.503 #endif
2.504
2.505 /* GL_OES_texture_float */
2.506 @@ -1066,29 +1208,29 @@
2.507 #ifndef GL_KHR_debug
2.508 #define GL_KHR_debug 1
2.509 #ifdef GL_GLEXT_PROTOTYPES
2.510 -GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
2.511 -GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
2.512 -GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
2.513 -GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
2.514 -GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
2.515 -GL_APICALL void GL_APIENTRY glPopDebugGroup (void);
2.516 -GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
2.517 -GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
2.518 -GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
2.519 -GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
2.520 -GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
2.521 -#endif
2.522 -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
2.523 -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
2.524 -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
2.525 -typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
2.526 -typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
2.527 -typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
2.528 -typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
2.529 -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
2.530 -typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
2.531 -typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
2.532 -typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params);
2.533 +GL_APICALL void GL_APIENTRY glDebugMessageControlKHR (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
2.534 +GL_APICALL void GL_APIENTRY glDebugMessageInsertKHR (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
2.535 +GL_APICALL void GL_APIENTRY glDebugMessageCallbackKHR (GLDEBUGPROCKHR callback, const void *userParam);
2.536 +GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLogKHR (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
2.537 +GL_APICALL void GL_APIENTRY glPushDebugGroupKHR (GLenum source, GLuint id, GLsizei length, const GLchar *message);
2.538 +GL_APICALL void GL_APIENTRY glPopDebugGroupKHR (void);
2.539 +GL_APICALL void GL_APIENTRY glObjectLabelKHR (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
2.540 +GL_APICALL void GL_APIENTRY glGetObjectLabelKHR (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
2.541 +GL_APICALL void GL_APIENTRY glObjectPtrLabelKHR (const void *ptr, GLsizei length, const GLchar *label);
2.542 +GL_APICALL void GL_APIENTRY glGetObjectPtrLabelKHR (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
2.543 +GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, GLvoid **params);
2.544 +#endif
2.545 +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
2.546 +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
2.547 +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKKHRPROC) (GLDEBUGPROCKHR callback, const void *userParam);
2.548 +typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGKHRPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
2.549 +typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPKHRPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
2.550 +typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPKHRPROC) (void);
2.551 +typedef void (GL_APIENTRYP PFNGLOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
2.552 +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
2.553 +typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei length, const GLchar *label);
2.554 +typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
2.555 +typedef void (GL_APIENTRYP PFNGLGETPOINTERVKHRPROC) (GLenum pname, GLvoid **params);
2.556 #endif
2.557
2.558 #ifndef GL_KHR_texture_compression_astc_ldr
2.559 @@ -1148,6 +1290,11 @@
2.560 * ANGLE extension functions
2.561 *------------------------------------------------------------------------*/
2.562
2.563 +/* GL_ANGLE_depth_texture */
2.564 +#ifndef GL_ANGLE_depth_texture
2.565 +#define GL_ANGLE_depth_texture 1
2.566 +#endif
2.567 +
2.568 /* GL_ANGLE_framebuffer_blit */
2.569 #ifndef GL_ANGLE_framebuffer_blit
2.570 #define GL_ANGLE_framebuffer_blit 1
2.571 @@ -1166,43 +1313,49 @@
2.572 typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.573 #endif
2.574
2.575 -#ifndef GL_ANGLE_instanced_arrays
2.576 +#ifndef GL_ANGLE_instanced_arrays
2.577 +#define GL_ANGLE_instanced_arrays 1
2.578 #ifdef GL_GLEXT_PROTOTYPES
2.579 GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
2.580 GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
2.581 GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor);
2.582 #endif
2.583 -typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
2.584 -typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
2.585 -typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
2.586 +typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
2.587 +typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
2.588 +typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
2.589 #endif
2.590
2.591 /* GL_ANGLE_pack_reverse_row_order */
2.592 -#ifndef GL_ANGLE_pack_reverse_row_order
2.593 +#ifndef GL_ANGLE_pack_reverse_row_order
2.594 #define GL_ANGLE_pack_reverse_row_order 1
2.595 #endif
2.596
2.597 +/* GL_ANGLE_program_binary */
2.598 +#ifndef GL_ANGLE_program_binary
2.599 +#define GL_ANGLE_program_binary 1
2.600 +#endif
2.601 +
2.602 /* GL_ANGLE_texture_compression_dxt3 */
2.603 -#ifndef GL_ANGLE_texture_compression_dxt3
2.604 +#ifndef GL_ANGLE_texture_compression_dxt3
2.605 #define GL_ANGLE_texture_compression_dxt3 1
2.606 #endif
2.607
2.608 /* GL_ANGLE_texture_compression_dxt5 */
2.609 -#ifndef GL_ANGLE_texture_compression_dxt5
2.610 +#ifndef GL_ANGLE_texture_compression_dxt5
2.611 #define GL_ANGLE_texture_compression_dxt5 1
2.612 #endif
2.613
2.614 /* GL_ANGLE_texture_usage */
2.615 -#ifndef GL_ANGLE_texture_usage
2.616 +#ifndef GL_ANGLE_texture_usage
2.617 #define GL_ANGLE_texture_usage 1
2.618 #endif
2.619
2.620 -#ifndef GL_ANGLE_translated_shader_source
2.621 +#ifndef GL_ANGLE_translated_shader_source
2.622 #define GL_ANGLE_translated_shader_source 1
2.623 #ifdef GL_GLEXT_PROTOTYPES
2.624 GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
2.625 #endif
2.626 -typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
2.627 +typedef void (GL_APIENTRYP PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
2.628 #endif
2.629
2.630 /*------------------------------------------------------------------------*
2.631 @@ -1222,7 +1375,7 @@
2.632 #ifndef GL_APPLE_framebuffer_multisample
2.633 #define GL_APPLE_framebuffer_multisample 1
2.634 #ifdef GL_GLEXT_PROTOTYPES
2.635 -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
2.636 +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.637 GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
2.638 #endif /* GL_GLEXT_PROTOTYPES */
2.639 typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.640 @@ -1331,6 +1484,42 @@
2.641 typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
2.642 #endif
2.643
2.644 +#ifndef GL_EXT_disjoint_timer_query
2.645 +#define GL_EXT_disjoint_timer_query 1
2.646 +#ifdef GL_GLEXT_PROTOTYPES
2.647 +GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
2.648 +GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids);
2.649 +GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
2.650 +GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
2.651 +GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
2.652 +GL_APICALL void GL_APIENTRY glQueryCounterEXT (GLuint id, GLenum target);
2.653 +GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params);
2.654 +GL_APICALL void GL_APIENTRY glGetQueryObjectivEXT (GLuint id, GLenum pname, GLint *params);
2.655 +GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params);
2.656 +GL_APICALL void GL_APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
2.657 +GL_APICALL void GL_APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
2.658 +#endif
2.659 +typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
2.660 +typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
2.661 +typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
2.662 +typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
2.663 +typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
2.664 +typedef void (GL_APIENTRYP PFNGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target);
2.665 +typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
2.666 +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVEXTPROC) (GLuint id, GLenum pname, GLint *params);
2.667 +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
2.668 +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
2.669 +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
2.670 +#endif /* GL_EXT_disjoint_timer_query */
2.671 +
2.672 +#ifndef GL_EXT_draw_buffers
2.673 +#define GL_EXT_draw_buffers 1
2.674 +#ifdef GL_GLEXT_PROTOTYPES
2.675 +GL_APICALL void GL_APIENTRY glDrawBuffersEXT (GLsizei n, const GLenum *bufs);
2.676 +#endif
2.677 +typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum *bufs);
2.678 +#endif /* GL_EXT_draw_buffers */
2.679 +
2.680 /* GL_EXT_map_buffer_range */
2.681 #ifndef GL_EXT_map_buffer_range
2.682 #define GL_EXT_map_buffer_range 1
2.683 @@ -1346,8 +1535,8 @@
2.684 #ifndef GL_EXT_multisampled_render_to_texture
2.685 #define GL_EXT_multisampled_render_to_texture 1
2.686 #ifdef GL_GLEXT_PROTOTYPES
2.687 -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
2.688 -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
2.689 +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.690 +GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
2.691 #endif
2.692 typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.693 typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
2.694 @@ -1369,32 +1558,17 @@
2.695 #ifndef GL_EXT_multi_draw_arrays
2.696 #define GL_EXT_multi_draw_arrays 1
2.697 #ifdef GL_GLEXT_PROTOTYPES
2.698 -GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
2.699 -GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
2.700 +GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
2.701 +GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
2.702 #endif /* GL_GLEXT_PROTOTYPES */
2.703 -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
2.704 -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
2.705 +typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
2.706 +typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
2.707 #endif
2.708
2.709 /* GL_EXT_occlusion_query_boolean */
2.710 #ifndef GL_EXT_occlusion_query_boolean
2.711 #define GL_EXT_occlusion_query_boolean 1
2.712 -#ifdef GL_GLEXT_PROTOTYPES
2.713 -GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
2.714 -GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids);
2.715 -GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
2.716 -GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
2.717 -GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
2.718 -GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params);
2.719 -GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params);
2.720 -#endif
2.721 -typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
2.722 -typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
2.723 -typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
2.724 -typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
2.725 -typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
2.726 -typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
2.727 -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
2.728 +/* All entry points also exist in GL_EXT_disjoint_timer_query */
2.729 #endif
2.730
2.731 /* GL_EXT_read_format_bgra */
2.732 @@ -1407,13 +1581,13 @@
2.733 #define GL_EXT_robustness 1
2.734 #ifdef GL_GLEXT_PROTOTYPES
2.735 GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
2.736 -GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
2.737 -GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params);
2.738 +GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
2.739 +GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
2.740 GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
2.741 #endif
2.742 typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
2.743 -typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
2.744 -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params);
2.745 +typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
2.746 +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
2.747 typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
2.748 #endif
2.749
2.750 @@ -1595,12 +1769,17 @@
2.751 #define GL_IMG_texture_compression_pvrtc 1
2.752 #endif
2.753
2.754 +/* GL_IMG_texture_compression_pvrtc2 */
2.755 +#ifndef GL_IMG_texture_compression_pvrtc2
2.756 +#define GL_IMG_texture_compression_pvrtc2 1
2.757 +#endif
2.758 +
2.759 /* GL_IMG_multisampled_render_to_texture */
2.760 #ifndef GL_IMG_multisampled_render_to_texture
2.761 #define GL_IMG_multisampled_render_to_texture 1
2.762 #ifdef GL_GLEXT_PROTOTYPES
2.763 -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
2.764 -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
2.765 +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.766 +GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
2.767 #endif
2.768 typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.769 typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
2.770 @@ -1635,6 +1814,17 @@
2.771 typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs);
2.772 #endif
2.773
2.774 +/* GL_NV_draw_instanced */
2.775 +#ifndef GL_NV_draw_instanced
2.776 +#define GL_NV_draw_instanced 1
2.777 +#ifdef GL_GLEXT_PROTOTYPES
2.778 +GL_APICALL void GL_APIENTRY glDrawArraysInstancedNV (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
2.779 +GL_APICALL void GL_APIENTRY glDrawElementsInstancedNV (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
2.780 +#endif
2.781 +typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDNVPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
2.782 +typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDNVPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
2.783 +#endif
2.784 +
2.785 /* GL_NV_fbo_color_attachments */
2.786 #ifndef GL_NV_fbo_color_attachments
2.787 #define GL_NV_fbo_color_attachments 1
2.788 @@ -1644,13 +1834,13 @@
2.789 #ifndef GL_NV_fence
2.790 #define GL_NV_fence 1
2.791 #ifdef GL_GLEXT_PROTOTYPES
2.792 -GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
2.793 -GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *);
2.794 -GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint);
2.795 -GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint);
2.796 -GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
2.797 -GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint);
2.798 -GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum);
2.799 +GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
2.800 +GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
2.801 +GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);
2.802 +GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);
2.803 +GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
2.804 +GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint fence);
2.805 +GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
2.806 #endif
2.807 typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
2.808 typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
2.809 @@ -1661,6 +1851,38 @@
2.810 typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
2.811 #endif
2.812
2.813 +/* GL_NV_framebuffer_blit */
2.814 +#ifndef GL_NV_framebuffer_blit
2.815 +#define GL_NV_framebuffer_blit 1
2.816 +#ifdef GL_GLEXT_PROTOTYPES
2.817 +GL_APICALL void GL_APIENTRY glBlitFramebufferNV (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
2.818 +#endif
2.819 +typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
2.820 +#endif
2.821 +
2.822 +/* GL_NV_framebuffer_multisample */
2.823 +#ifndef GL_NV_framebuffer_multisample
2.824 +#define GL_NV_framebuffer_multisample 1
2.825 +#ifdef GL_GLEXT_PROTOTYPES
2.826 +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleNV ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.827 +#endif
2.828 +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC) ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
2.829 +#endif
2.830 +
2.831 +/* GL_NV_generate_mipmap_sRGB */
2.832 +#ifndef GL_NV_generate_mipmap_sRGB
2.833 +#define GL_NV_generate_mipmap_sRGB 1
2.834 +#endif
2.835 +
2.836 +/* GL_NV_instanced_arrays */
2.837 +#ifndef GL_NV_instanced_arrays
2.838 +#define GL_NV_instanced_arrays 1
2.839 +#ifdef GL_GLEXT_PROTOTYPES
2.840 +GL_APICALL void GL_APIENTRY glVertexAttribDivisorNV (GLuint index, GLuint divisor);
2.841 +#endif
2.842 +typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORNVPROC) (GLuint index, GLuint divisor);
2.843 +#endif
2.844 +
2.845 /* GL_NV_read_buffer */
2.846 #ifndef GL_NV_read_buffer
2.847 #define GL_NV_read_buffer 1
2.848 @@ -1690,6 +1912,26 @@
2.849 #define GL_NV_read_stencil 1
2.850 #endif
2.851
2.852 +/* GL_NV_shadow_samplers_array */
2.853 +#ifndef GL_NV_shadow_samplers_array
2.854 +#define GL_NV_shadow_samplers_array 1
2.855 +#endif
2.856 +
2.857 +/* GL_NV_shadow_samplers_cube */
2.858 +#ifndef GL_NV_shadow_samplers_cube
2.859 +#define GL_NV_shadow_samplers_cube 1
2.860 +#endif
2.861 +
2.862 +/* GL_NV_sRGB_formats */
2.863 +#ifndef GL_NV_sRGB_formats
2.864 +#define GL_NV_sRGB_formats 1
2.865 +#endif
2.866 +
2.867 +/* GL_NV_texture_border_clamp */
2.868 +#ifndef GL_NV_texture_border_clamp
2.869 +#define GL_NV_texture_border_clamp 1
2.870 +#endif
2.871 +
2.872 /* GL_NV_texture_compression_s3tc_update */
2.873 #ifndef GL_NV_texture_compression_s3tc_update
2.874 #define GL_NV_texture_compression_s3tc_update 1
2.875 @@ -1806,4 +2048,3 @@
2.876 #endif
2.877
2.878 #endif /* __gl2ext_h_ */
2.879 -
3.1 --- a/include/SDL_opengles2_gl2platform.h Wed Jun 04 01:32:52 2014 -0700
3.2 +++ b/include/SDL_opengles2_gl2platform.h Wed Jun 04 01:35:36 2014 -0700
3.3 @@ -28,4 +28,3 @@
3.4 #endif
3.5
3.6 #endif /* __gl2platform_h_ */
3.7 -
4.1 --- a/include/SDL_opengles2_khrplatform.h Wed Jun 04 01:32:52 2014 -0700
4.2 +++ b/include/SDL_opengles2_khrplatform.h Wed Jun 04 01:35:36 2014 -0700
4.3 @@ -25,78 +25,78 @@
4.4 */
4.5
4.6 /* Khronos platform-specific types and definitions.
4.7 -*
4.8 -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
4.9 -*
4.10 -* Adopters may modify this file to suit their platform. Adopters are
4.11 -* encouraged to submit platform specific modifications to the Khronos
4.12 -* group so that they can be included in future versions of this file.
4.13 -* Please submit changes by sending them to the public Khronos Bugzilla
4.14 -* (http://khronos.org/bugzilla) by filing a bug against product
4.15 -* "Khronos (general)" component "Registry".
4.16 -*
4.17 -* A predefined template which fills in some of the bug fields can be
4.18 -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
4.19 -* must create a Bugzilla login first.
4.20 -*
4.21 -*
4.22 -* See the Implementer's Guidelines for information about where this file
4.23 -* should be located on your system and for more details of its use:
4.24 -* http://www.khronos.org/registry/implementers_guide.pdf
4.25 -*
4.26 -* This file should be included as
4.27 -* #include <KHR/khrplatform.h>
4.28 -* by Khronos client API header files that use its types and defines.
4.29 -*
4.30 -* The types in khrplatform.h should only be used to define API-specific types.
4.31 -*
4.32 -* Types defined in khrplatform.h:
4.33 -* khronos_int8_t signed 8 bit
4.34 -* khronos_uint8_t unsigned 8 bit
4.35 -* khronos_int16_t signed 16 bit
4.36 -* khronos_uint16_t unsigned 16 bit
4.37 -* khronos_int32_t signed 32 bit
4.38 -* khronos_uint32_t unsigned 32 bit
4.39 -* khronos_int64_t signed 64 bit
4.40 -* khronos_uint64_t unsigned 64 bit
4.41 -* khronos_intptr_t signed same number of bits as a pointer
4.42 -* khronos_uintptr_t unsigned same number of bits as a pointer
4.43 -* khronos_ssize_t signed size
4.44 -* khronos_usize_t unsigned size
4.45 -* khronos_float_t signed 32 bit floating point
4.46 -* khronos_time_ns_t unsigned 64 bit time in nanoseconds
4.47 -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
4.48 -* nanoseconds
4.49 -* khronos_stime_nanoseconds_t signed time interval in nanoseconds
4.50 -* khronos_boolean_enum_t enumerated boolean type. This should
4.51 -* only be used as a base type when a client API's boolean type is
4.52 -* an enum. Client APIs which use an integer or other type for
4.53 -* booleans cannot use this as the base type for their boolean.
4.54 -*
4.55 -* Tokens defined in khrplatform.h:
4.56 -*
4.57 -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
4.58 -*
4.59 -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
4.60 -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
4.61 -*
4.62 -* Calling convention macros defined in this file:
4.63 -* KHRONOS_APICALL
4.64 -* KHRONOS_APIENTRY
4.65 -* KHRONOS_APIATTRIBUTES
4.66 -*
4.67 -* These may be used in function prototypes as:
4.68 -*
4.69 -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
4.70 -* int arg1,
4.71 -* int arg2) KHRONOS_APIATTRIBUTES;
4.72 -*/
4.73 + *
4.74 + * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
4.75 + *
4.76 + * Adopters may modify this file to suit their platform. Adopters are
4.77 + * encouraged to submit platform specific modifications to the Khronos
4.78 + * group so that they can be included in future versions of this file.
4.79 + * Please submit changes by sending them to the public Khronos Bugzilla
4.80 + * (http://khronos.org/bugzilla) by filing a bug against product
4.81 + * "Khronos (general)" component "Registry".
4.82 + *
4.83 + * A predefined template which fills in some of the bug fields can be
4.84 + * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
4.85 + * must create a Bugzilla login first.
4.86 + *
4.87 + *
4.88 + * See the Implementer's Guidelines for information about where this file
4.89 + * should be located on your system and for more details of its use:
4.90 + * http://www.khronos.org/registry/implementers_guide.pdf
4.91 + *
4.92 + * This file should be included as
4.93 + * #include <KHR/khrplatform.h>
4.94 + * by Khronos client API header files that use its types and defines.
4.95 + *
4.96 + * The types in khrplatform.h should only be used to define API-specific types.
4.97 + *
4.98 + * Types defined in khrplatform.h:
4.99 + * khronos_int8_t signed 8 bit
4.100 + * khronos_uint8_t unsigned 8 bit
4.101 + * khronos_int16_t signed 16 bit
4.102 + * khronos_uint16_t unsigned 16 bit
4.103 + * khronos_int32_t signed 32 bit
4.104 + * khronos_uint32_t unsigned 32 bit
4.105 + * khronos_int64_t signed 64 bit
4.106 + * khronos_uint64_t unsigned 64 bit
4.107 + * khronos_intptr_t signed same number of bits as a pointer
4.108 + * khronos_uintptr_t unsigned same number of bits as a pointer
4.109 + * khronos_ssize_t signed size
4.110 + * khronos_usize_t unsigned size
4.111 + * khronos_float_t signed 32 bit floating point
4.112 + * khronos_time_ns_t unsigned 64 bit time in nanoseconds
4.113 + * khronos_utime_nanoseconds_t unsigned time interval or absolute time in
4.114 + * nanoseconds
4.115 + * khronos_stime_nanoseconds_t signed time interval in nanoseconds
4.116 + * khronos_boolean_enum_t enumerated boolean type. This should
4.117 + * only be used as a base type when a client API's boolean type is
4.118 + * an enum. Client APIs which use an integer or other type for
4.119 + * booleans cannot use this as the base type for their boolean.
4.120 + *
4.121 + * Tokens defined in khrplatform.h:
4.122 + *
4.123 + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
4.124 + *
4.125 + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
4.126 + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
4.127 + *
4.128 + * Calling convention macros defined in this file:
4.129 + * KHRONOS_APICALL
4.130 + * KHRONOS_APIENTRY
4.131 + * KHRONOS_APIATTRIBUTES
4.132 + *
4.133 + * These may be used in function prototypes as:
4.134 + *
4.135 + * KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
4.136 + * int arg1,
4.137 + * int arg2) KHRONOS_APIATTRIBUTES;
4.138 + */
4.139
4.140 /*-------------------------------------------------------------------------
4.141 -* Definition of KHRONOS_APICALL
4.142 -*-------------------------------------------------------------------------
4.143 -* This precedes the return type of the function in the function prototype.
4.144 -*/
4.145 + * Definition of KHRONOS_APICALL
4.146 + *-------------------------------------------------------------------------
4.147 + * This precedes the return type of the function in the function prototype.
4.148 + */
4.149 #if defined(_WIN32) && !defined(__SCITECH_SNAP__)
4.150 # define KHRONOS_APICALL __declspec(dllimport)
4.151 #elif defined (__SYMBIAN32__)
4.152 @@ -106,23 +106,23 @@
4.153 #endif
4.154
4.155 /*-------------------------------------------------------------------------
4.156 -* Definition of KHRONOS_APIENTRY
4.157 -*-------------------------------------------------------------------------
4.158 -* This follows the return type of the function and precedes the function
4.159 -* name in the function prototype.
4.160 -*/
4.161 + * Definition of KHRONOS_APIENTRY
4.162 + *-------------------------------------------------------------------------
4.163 + * This follows the return type of the function and precedes the function
4.164 + * name in the function prototype.
4.165 + */
4.166 #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
4.167 -/* Win32 but not WinCE */
4.168 + /* Win32 but not WinCE */
4.169 # define KHRONOS_APIENTRY __stdcall
4.170 #else
4.171 # define KHRONOS_APIENTRY
4.172 #endif
4.173
4.174 /*-------------------------------------------------------------------------
4.175 -* Definition of KHRONOS_APIATTRIBUTES
4.176 -*-------------------------------------------------------------------------
4.177 -* This follows the closing parenthesis of the function prototype arguments.
4.178 -*/
4.179 + * Definition of KHRONOS_APIATTRIBUTES
4.180 + *-------------------------------------------------------------------------
4.181 + * This follows the closing parenthesis of the function prototype arguments.
4.182 + */
4.183 #if defined (__ARMCC_2__)
4.184 #define KHRONOS_APIATTRIBUTES __softfp
4.185 #else
4.186 @@ -130,14 +130,14 @@
4.187 #endif
4.188
4.189 /*-------------------------------------------------------------------------
4.190 -* basic type definitions
4.191 -*-----------------------------------------------------------------------*/
4.192 + * basic type definitions
4.193 + *-----------------------------------------------------------------------*/
4.194 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
4.195
4.196
4.197 /*
4.198 -* Using <stdint.h>
4.199 -*/
4.200 + * Using <stdint.h>
4.201 + */
4.202 #include <stdint.h>
4.203 typedef int32_t khronos_int32_t;
4.204 typedef uint32_t khronos_uint32_t;
4.205 @@ -149,8 +149,8 @@
4.206 #elif defined(__VMS ) || defined(__sgi)
4.207
4.208 /*
4.209 -* Using <inttypes.h>
4.210 -*/
4.211 + * Using <inttypes.h>
4.212 + */
4.213 #include <inttypes.h>
4.214 typedef int32_t khronos_int32_t;
4.215 typedef uint32_t khronos_uint32_t;
4.216 @@ -162,8 +162,8 @@
4.217 #elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
4.218
4.219 /*
4.220 -* Win32
4.221 -*/
4.222 + * Win32
4.223 + */
4.224 typedef __int32 khronos_int32_t;
4.225 typedef unsigned __int32 khronos_uint32_t;
4.226 typedef __int64 khronos_int64_t;
4.227 @@ -174,8 +174,8 @@
4.228 #elif defined(__sun__) || defined(__digital__)
4.229
4.230 /*
4.231 -* Sun or Digital
4.232 -*/
4.233 + * Sun or Digital
4.234 + */
4.235 typedef int khronos_int32_t;
4.236 typedef unsigned int khronos_uint32_t;
4.237 #if defined(__arch64__) || defined(_LP64)
4.238 @@ -191,8 +191,8 @@
4.239 #elif 0
4.240
4.241 /*
4.242 -* Hypothetical platform with no float or int64 support
4.243 -*/
4.244 + * Hypothetical platform with no float or int64 support
4.245 + */
4.246 typedef int khronos_int32_t;
4.247 typedef unsigned int khronos_uint32_t;
4.248 #define KHRONOS_SUPPORT_INT64 0
4.249 @@ -201,8 +201,8 @@
4.250 #else
4.251
4.252 /*
4.253 -* Generic fallback
4.254 -*/
4.255 + * Generic fallback
4.256 + */
4.257 #include <stdint.h>
4.258 typedef int32_t khronos_int32_t;
4.259 typedef uint32_t khronos_uint32_t;
4.260 @@ -215,18 +215,18 @@
4.261
4.262
4.263 /*
4.264 -* Types that are (so far) the same on all platforms
4.265 -*/
4.266 + * Types that are (so far) the same on all platforms
4.267 + */
4.268 typedef signed char khronos_int8_t;
4.269 typedef unsigned char khronos_uint8_t;
4.270 typedef signed short int khronos_int16_t;
4.271 typedef unsigned short int khronos_uint16_t;
4.272
4.273 /*
4.274 -* Types that differ between LLP64 and LP64 architectures - in LLP64,
4.275 -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
4.276 -* to be the only LLP64 architecture in current use.
4.277 -*/
4.278 + * Types that differ between LLP64 and LP64 architectures - in LLP64,
4.279 + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
4.280 + * to be the only LLP64 architecture in current use.
4.281 + */
4.282 #ifdef _WIN64
4.283 typedef signed long long int khronos_intptr_t;
4.284 typedef unsigned long long int khronos_uintptr_t;
4.285 @@ -241,43 +241,42 @@
4.286
4.287 #if KHRONOS_SUPPORT_FLOAT
4.288 /*
4.289 -* Float type
4.290 -*/
4.291 + * Float type
4.292 + */
4.293 typedef float khronos_float_t;
4.294 #endif
4.295
4.296 #if KHRONOS_SUPPORT_INT64
4.297 /* Time types
4.298 -*
4.299 -* These types can be used to represent a time interval in nanoseconds or
4.300 -* an absolute Unadjusted System Time. Unadjusted System Time is the number
4.301 -* of nanoseconds since some arbitrary system event (e.g. since the last
4.302 -* time the system booted). The Unadjusted System Time is an unsigned
4.303 -* 64 bit value that wraps back to 0 every 584 years. Time intervals
4.304 -* may be either signed or unsigned.
4.305 -*/
4.306 + *
4.307 + * These types can be used to represent a time interval in nanoseconds or
4.308 + * an absolute Unadjusted System Time. Unadjusted System Time is the number
4.309 + * of nanoseconds since some arbitrary system event (e.g. since the last
4.310 + * time the system booted). The Unadjusted System Time is an unsigned
4.311 + * 64 bit value that wraps back to 0 every 584 years. Time intervals
4.312 + * may be either signed or unsigned.
4.313 + */
4.314 typedef khronos_uint64_t khronos_utime_nanoseconds_t;
4.315 typedef khronos_int64_t khronos_stime_nanoseconds_t;
4.316 #endif
4.317
4.318 /*
4.319 -* Dummy value used to pad enum types to 32 bits.
4.320 -*/
4.321 + * Dummy value used to pad enum types to 32 bits.
4.322 + */
4.323 #ifndef KHRONOS_MAX_ENUM
4.324 #define KHRONOS_MAX_ENUM 0x7FFFFFFF
4.325 #endif
4.326
4.327 /*
4.328 -* Enumerated boolean type
4.329 -*
4.330 -* Values other than zero should be considered to be true. Therefore
4.331 -* comparisons should not be made against KHRONOS_TRUE.
4.332 -*/
4.333 + * Enumerated boolean type
4.334 + *
4.335 + * Values other than zero should be considered to be true. Therefore
4.336 + * comparisons should not be made against KHRONOS_TRUE.
4.337 + */
4.338 typedef enum {
4.339 KHRONOS_FALSE = 0,
4.340 - KHRONOS_TRUE = 1,
4.341 + KHRONOS_TRUE = 1,
4.342 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
4.343 } khronos_boolean_enum_t;
4.344
4.345 #endif /* __khrplatform_h_ */
4.346 -