From 3be4d079d7c66852242e46818622f98e025a5d9d Mon Sep 17 00:00:00 2001 From: omniavinco Date: Sat, 18 Jun 2016 02:47:53 +0900 Subject: [PATCH] Generate Sources of origin/master updated at Fri Jun 17 17:47:53 GMT 2016 --- include/GL/eglew.h | 1 + include/GL/glew.h | 45 +++++++++++++++++++++++++++++++-------------- src/glew.c | 35 ++++++++++++++++++++++++++++++++++- src/glewinfo.c | 14 ++++++++++++++ 4 files changed, 80 insertions(+), 15 deletions(-) diff --git a/include/GL/eglew.h b/include/GL/eglew.h index 3fddc4f..aef65c8 100644 --- a/include/GL/eglew.h +++ b/include/GL/eglew.h @@ -148,6 +148,7 @@ typedef void *EGLOutputPortEXT; typedef void *EGLSyncNV; typedef khronos_utime_nanoseconds_t EGLTimeNV; typedef khronos_utime_nanoseconds_t EGLuint64NV; +typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; struct EGLClientPixmapHI; diff --git a/include/GL/glew.h b/include/GL/glew.h index f0c7d45..94464e0 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -6612,7 +6612,6 @@ typedef void (GLAPIENTRY * PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, G #define GL_TIMEOUT_EXPIRED 0x911B #define GL_CONDITION_SATISFIED 0x911C #define GL_WAIT_FAILED 0x911D -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout); typedef void (GLAPIENTRY * PFNGLDELETESYNCPROC) (GLsync GLsync); @@ -7375,7 +7374,6 @@ typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]); #define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 #define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 #define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFF typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); @@ -11621,6 +11619,26 @@ typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight); #endif /* GL_EXT_vertex_weighting */ +/* ------------------------ GL_EXT_window_rectangles ----------------------- */ + +#ifndef GL_EXT_window_rectangles +#define GL_EXT_window_rectangles 1 + +#define GL_INCLUSIVE_EXT 0x8F10 +#define GL_EXCLUSIVE_EXT 0x8F11 +#define GL_WINDOW_RECTANGLE_EXT 0x8F12 +#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13 +#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14 +#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15 + +typedef void (GLAPIENTRY * PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint box[]); + +#define glWindowRectanglesEXT GLEW_GET_FUN(__glewWindowRectanglesEXT) + +#define GLEW_EXT_window_rectangles GLEW_GET_VAR(__GLEW_EXT_window_rectangles) + +#endif /* GL_EXT_window_rectangles */ + /* ------------------------- GL_EXT_x11_sync_object ------------------------ */ #ifndef GL_EXT_x11_sync_object @@ -12580,8 +12598,8 @@ typedef void (GLAPIENTRY * PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint valu #define GL_NV_clip_space_w_scaling 1 #define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C -#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF 0x937D -#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF 0x937E +#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D +#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff); @@ -12596,13 +12614,7 @@ typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLf #ifndef GL_NV_command_list #define GL_NV_command_list 1 -#define GL_ALPHA_REF_COMMAND_NV 0x000 -#define GL_BLEND_COLOR_COMMAND_NV 0x000 -#define GL_LINE_WIDTH_COMMAND_NV 0x000 -#define GL_POLYGON_OFFSET_COMMAND_NV 0x000 -#define GL_STENCIL_REF_COMMAND_NV 0x000 #define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 -#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000 #define GL_NOP_COMMAND_NV 0x0001 #define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 #define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 @@ -12612,6 +12624,12 @@ typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLf #define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 #define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 #define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 +#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000a +#define GL_BLEND_COLOR_COMMAND_NV 0x000b +#define GL_STENCIL_REF_COMMAND_NV 0x000c +#define GL_LINE_WIDTH_COMMAND_NV 0x000d +#define GL_POLYGON_OFFSET_COMMAND_NV 0x000e +#define GL_ALPHA_REF_COMMAND_NV 0x000f #define GL_VIEWPORT_COMMAND_NV 0x0010 #define GL_SCISSOR_COMMAND_NV 0x0011 #define GL_FRONT_FACE_COMMAND_NV 0x0012 @@ -15964,10 +15982,6 @@ typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void); #ifndef GL_SGIX_fog_texture #define GL_SGIX_fog_texture 1 -#define GL_FOG_PATCHY_FACTOR_SGIX 0 -#define GL_FRAGMENT_FOG_SGIX 0 -#define GL_TEXTURE_FOG_SGIX 0 - typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname); #define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX) @@ -18539,6 +18553,8 @@ GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT; GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT; GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT; +GLEW_FUN_EXPORT PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT; + GLEW_FUN_EXPORT PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT; GLEW_FUN_EXPORT PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY; @@ -19697,6 +19713,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_bgra; GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_attrib_64bit; GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader; GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting; +GLEW_VAR_EXPORT GLboolean __GLEW_EXT_window_rectangles; GLEW_VAR_EXPORT GLboolean __GLEW_EXT_x11_sync_object; GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_frame_terminator; GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker; diff --git a/src/glew.c b/src/glew.c index 4d02e35..f06b8b2 100644 --- a/src/glew.c +++ b/src/glew.c @@ -2208,6 +2208,8 @@ PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL; PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL; PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL; +PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT = NULL; + PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT = NULL; PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY = NULL; @@ -3367,6 +3369,7 @@ GLboolean __GLEW_EXT_vertex_array_bgra = GL_FALSE; GLboolean __GLEW_EXT_vertex_attrib_64bit = GL_FALSE; GLboolean __GLEW_EXT_vertex_shader = GL_FALSE; GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE; +GLboolean __GLEW_EXT_window_rectangles = GL_FALSE; GLboolean __GLEW_EXT_x11_sync_object = GL_FALSE; GLboolean __GLEW_GREMEDY_frame_terminator = GL_FALSE; GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE; @@ -4716,6 +4719,9 @@ static const char * _glewExtensionLookup[] = { #ifdef GL_EXT_vertex_weighting "GL_EXT_vertex_weighting", #endif +#ifdef GL_EXT_window_rectangles + "GL_EXT_window_rectangles", +#endif #ifdef GL_EXT_x11_sync_object "GL_EXT_x11_sync_object", #endif @@ -5386,7 +5392,7 @@ static const char * _glewExtensionLookup[] = { }; /* Detected in the extension string or strings */ -static GLboolean _glewExtensionString[597]; +static GLboolean _glewExtensionString[598]; /* Detected via extension string or experimental mode */ static GLboolean* _glewExtensionEnabled[] = { #ifdef GL_VERSION_1_2 @@ -6514,6 +6520,9 @@ static GLboolean* _glewExtensionEnabled[] = { #ifdef GL_EXT_vertex_weighting &__GLEW_EXT_vertex_weighting, #endif +#ifdef GL_EXT_window_rectangles + &__GLEW_EXT_window_rectangles, +#endif #ifdef GL_EXT_x11_sync_object &__GLEW_EXT_x11_sync_object, #endif @@ -7371,6 +7380,7 @@ static GLboolean _glewInit_GL_EXT_vertex_array (); static GLboolean _glewInit_GL_EXT_vertex_attrib_64bit (); static GLboolean _glewInit_GL_EXT_vertex_shader (); static GLboolean _glewInit_GL_EXT_vertex_weighting (); +static GLboolean _glewInit_GL_EXT_window_rectangles (); static GLboolean _glewInit_GL_EXT_x11_sync_object (); static GLboolean _glewInit_GL_GREMEDY_frame_terminator (); static GLboolean _glewInit_GL_GREMEDY_string_marker (); @@ -11459,6 +11469,19 @@ static GLboolean _glewInit_GL_EXT_vertex_weighting () #endif /* GL_EXT_vertex_weighting */ +#ifdef GL_EXT_window_rectangles + +static GLboolean _glewInit_GL_EXT_window_rectangles () +{ + GLboolean r = GL_FALSE; + + r = ((glWindowRectanglesEXT = (PFNGLWINDOWRECTANGLESEXTPROC)glewGetProcAddress((const GLubyte*)"glWindowRectanglesEXT")) == NULL) || r; + + return r; +} + +#endif /* GL_EXT_window_rectangles */ + #ifdef GL_EXT_x11_sync_object static GLboolean _glewInit_GL_EXT_x11_sync_object () @@ -14060,6 +14083,9 @@ static GLenum GLEWAPIENTRY glewContextInit () #ifdef GL_EXT_vertex_weighting if (glewExperimental || GLEW_EXT_vertex_weighting) GLEW_EXT_vertex_weighting = !_glewInit_GL_EXT_vertex_weighting(); #endif /* GL_EXT_vertex_weighting */ +#ifdef GL_EXT_window_rectangles + if (glewExperimental || GLEW_EXT_window_rectangles) GLEW_EXT_window_rectangles = !_glewInit_GL_EXT_window_rectangles(); +#endif /* GL_EXT_window_rectangles */ #ifdef GL_EXT_x11_sync_object if (glewExperimental || GLEW_EXT_x11_sync_object) GLEW_EXT_x11_sync_object = !_glewInit_GL_EXT_x11_sync_object(); #endif /* GL_EXT_x11_sync_object */ @@ -20387,6 +20413,13 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name) continue; } #endif +#ifdef GL_EXT_window_rectangles + if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_rectangles", 17)) + { + ret = GLEW_EXT_window_rectangles; + continue; + } +#endif #ifdef GL_EXT_x11_sync_object if (_glewStrSame3(&pos, &len, (const GLubyte*)"x11_sync_object", 15)) { diff --git a/src/glewinfo.c b/src/glewinfo.c index c2ea896..994fac6 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c @@ -5395,6 +5395,17 @@ static void _glewInfo_GL_EXT_vertex_weighting (void) #endif /* GL_EXT_vertex_weighting */ +#ifdef GL_EXT_window_rectangles + +static void _glewInfo_GL_EXT_window_rectangles (void) +{ + glewPrintExt("GL_EXT_window_rectangles", GLEW_EXT_window_rectangles, glewIsSupported("GL_EXT_window_rectangles"), glewGetExtension("GL_EXT_window_rectangles")); + + glewInfoFunc("glWindowRectanglesEXT", glWindowRectanglesEXT == NULL); +} + +#endif /* GL_EXT_window_rectangles */ + #ifdef GL_EXT_x11_sync_object static void _glewInfo_GL_EXT_x11_sync_object (void) @@ -11847,6 +11858,9 @@ static void glewInfo (void) #ifdef GL_EXT_vertex_weighting _glewInfo_GL_EXT_vertex_weighting(); #endif /* GL_EXT_vertex_weighting */ +#ifdef GL_EXT_window_rectangles + _glewInfo_GL_EXT_window_rectangles(); +#endif /* GL_EXT_window_rectangles */ #ifdef GL_EXT_x11_sync_object _glewInfo_GL_EXT_x11_sync_object(); #endif /* GL_EXT_x11_sync_object */