I went ahead and pushed this one with 'Reviewed-by: Ian Romanick'.
On 03/17/2014 01:43 AM, Petri Latvala wrote:
> ---
> include/GL/glext.h | 82
> ++++++++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 76 insertions(+), 6 deletions(-)
>
> diff --git a/include/GL/glext.h b/include/GL/glext.h
> index 62bae4c..a626580 100644
> --- a/include/GL/glext.h
> +++ b/include/GL/glext.h
> @@ -6,7 +6,7 @@ extern "C" {
> #endif
>
> /*
> -** Copyright (c) 2013 The Khronos Group Inc.
> +** Copyright (c) 2013-2014 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
> @@ -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: 24502 $ on $Date: 2013-12-12 13:14:39 -0800 (Thu, 12
> Dec 2013) $
> +** 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 20131212
> +#define GL_GLEXT_VERSION 20140313
>
> /* Generated C header for:
> * API: gl
> @@ -1485,7 +1485,7 @@ typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC)
> (GLenum target, GLenum atta
> typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target,
> GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height,
> GLboolean fixedsamplelocations);
> typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target,
> GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height,
> GLsizei depth, GLboolean fixedsamplelocations);
> typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint
> index, GLfloat *val);
> -typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield
> mask);
> +typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint maskNumber, GLbitfield
> mask);
> #ifdef GL_GLEXT_PROTOTYPES
> GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count,
> GLenum type, const void *indices, GLint basevertex);
> GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint
> start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint
> basevertex);
> @@ -1505,7 +1505,7 @@ GLAPI void APIENTRY glFramebufferTexture (GLenum
> target, GLenum attachment, GLui
> GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples,
> GLenum internalformat, GLsizei width, GLsizei height, GLboolean
> fixedsamplelocations);
> GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples,
> GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth,
> GLboolean fixedsamplelocations);
> GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat
> *val);
> -GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
> +GLAPI void APIENTRY glSampleMaski (GLuint maskNumber, GLbitfield mask);
> #endif
> #endif /* GL_VERSION_3_2 */
>
> @@ -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
> @@ -8126,6 +8130,52 @@ GLAPI void APIENTRY glTexCoordPointervINTEL (GLint
> size, GLenum type, const void
> #endif
> #endif /* GL_INTEL_parallel_arrays */
>
> +#ifndef GL_INTEL_performance_query
> +#define GL_INTEL_performance_query 1
> +#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000
> +#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001
> +#define GL_PERFQUERY_WAIT_INTEL 0x83FB
> +#define GL_PERFQUERY_FLUSH_INTEL 0x83FA
> +#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9
> +#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0
> +#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
> +#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
> +#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
> +#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4
> +#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
> +#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
> +#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
> +#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
> +#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
> +#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
> +#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
> +#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
> +#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
> +#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
> +typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
> +typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId,
> GLuint *queryHandle);
> +typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
> +typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
> +typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
> +typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId,
> GLuint *nextQueryId);
> +typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId,
> GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint
> counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint
> *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum,
> GLuint64 *rawCounterMaxValue);
> +typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle,
> GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar
> *queryName, GLuint *queryId);
> +typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId,
> GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint
> *noCounters, GLuint *noInstances, GLuint *capsMask);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle);
> +GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint
> *queryHandle);
> +GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle);
> +GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
> +GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
> +GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint
> *nextQueryId);
> +GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint
> counterId, GLuint counterNameLength, GLchar *counterName, GLuint
> counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint
> *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum,
> GLuint64 *rawCounterMaxValue);
> +GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint
> flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint
> *queryId);
> +GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint
> queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters,
> GLuint *noInstances, GLuint *capsMask);
> +#endif
> +#endif /* GL_INTEL_performance_query */
> +
> #ifndef GL_MESAX_texture_stack
> #define GL_MESAX_texture_stack 1
> #define GL_TEXTURE_1D_STACK_MESAX 0x8759
> @@ -8220,6 +8270,15 @@ GLAPI void APIENTRY glEndConditionalRenderNVX (void);
> #endif
> #endif /* GL_NVX_conditional_render */
>
> +#ifndef GL_NVX_gpu_memory_info
> +#define GL_NVX_gpu_memory_info 1
> +#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
> +#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
> +#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
> +#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
> +#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
> +#endif /* GL_NVX_gpu_memory_info */
> +
> #ifndef GL_NV_bindless_multi_draw_indirect
> #define GL_NV_bindless_multi_draw_indirect 1
> typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum
> mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint
> vertexBufferCount);
> @@ -9372,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
> @@ -9647,7 +9717,7 @@ typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const
> void *vdpDevice, const void
> typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
> typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC)
> (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint
> *textureNames);
> typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC)
> (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint
> *textureNames);
> -typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV
> surface);
> +typedef GLboolean (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV
> surface);
> typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV
> surface);
> typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV
> surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
> typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV
> surface, GLenum access);
>
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
