On 03/12/2014 05:54 AM, Petri Latvala wrote: > Until Khronos adds the definitions to glext.h, add definitions for this > extension to gl.h.
I don't know how we missed it, but the glext.h at http://www.opengl.org/registry/api/GL/glext.h does have the definitions. We should just import that instead. > Signed-off-by: Petri Latvala <petri.latv...@intel.com> > --- > include/GL/gl.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/include/GL/gl.h b/include/GL/gl.h > index 4e2932d..e2caf73 100644 > --- a/include/GL/gl.h > +++ b/include/GL/gl.h > @@ -2104,6 +2104,51 @@ typedef void (APIENTRYP > PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLe > typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) > (GLenum target, GLeglImageOES image); > #endif > > +#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 (GLAPIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle); > +typedef void (GLAPIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, > GLuint *queryHandle); > +typedef void (GLAPIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint > queryHandle); > +typedef void (GLAPIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); > +typedef void (GLAPIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint > *queryId); > +typedef void (GLAPIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, > GLuint *nextQueryId); > +typedef void (GLAPIENTRYP 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 (GLAPIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint > queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint > *bytesWritten); > +typedef void (GLAPIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar > *queryName, GLuint *queryId); > +typedef void (GLAPIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, > GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint > *noCounters, GLuint *noInstances, GLuint *capsMask); > +#ifdef GL_GLEXT_PROTOTYPES > +GLAPI void GLAPIENTRY glBeginPerfQueryINTEL (GLuint queryHandle); > +GLAPI void GLAPIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint > *queryHandle); > +GLAPI void GLAPIENTRY glDeletePerfQueryINTEL (GLuint queryHandle); > +GLAPI void GLAPIENTRY glEndPerfQueryINTEL (GLuint queryHandle); > +GLAPI void GLAPIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId); > +GLAPI void GLAPIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint > *nextQueryId); > +GLAPI void GLAPIENTRY 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 GLAPIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint > flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten); > +GLAPI void GLAPIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint > *queryId); > +GLAPI void GLAPIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint > queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, > GLuint *noInstances, GLuint *capsMask); > +#endif > +#endif /* GL_INTEL_performance_query */ > > /** > ** NOTE!!!!! If you add new functions to this file, or update > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
