[Misc] (All): Sync with dev-es.

MG/Constants.h

@@ -5,14 +5,29 @@
 #ifndef MOBILEGL_CONSTANTS_H
 #define MOBILEGL_CONSTANTS_H
 
+#include <array>
+#include <unordered_map>
+#include <unordered_set>
+#include <GL/gl.h>
+#include <ankerl/unordered_dense.h>
+
 #ifdef __ANDROID__
 #define __ANDROID_API__ 26
 #endif
-#define MG_EXPORT extern "C" __attribute__((visibility("default")))
 
-#include <array>
-#include <unordered_set>
-#include <GL/gl.h>
+#ifdef _WIN32
+#define MG_EXPORT extern "C" __declspec(dllexport)
+#else
+#define MG_EXPORT extern "C" __attribute__((visibility("default")))
+#endif
+
+namespace ankerl {
+    template <typename K, typename V>
+    using unordered_map = ankerl::unordered_dense::map<K, V>;
+    
+    template <typename T>
+    using unordered_set = ankerl::unordered_dense::set<T>;
+}
 
 namespace MG_Constants {
     namespace Common {
@@ -24,7 +39,7 @@ namespace MG_Constants {
     }
     
     namespace Blend {
-        static const std::unordered_set<GLenum> VALID_FACTORS = {
+        static const ankerl::unordered_set<GLenum> VALID_FACTORS = {
                 GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
                 GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
                 GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR,
@@ -33,51 +48,51 @@ namespace MG_Constants {
     }
     
     namespace Depth {
-        static const std::unordered_set<GLenum> VALID_FUNCS = {
+        static const ankerl::unordered_set<GLenum> VALID_FUNCS = {
                 GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL, GL_GREATER, GL_NOTEQUAL, GL_GEQUAL, GL_ALWAYS
         }; // OpenGL 3
     }
     
     namespace CommonState {
-        static const std::unordered_set<GLenum> VALID_CAPS = {
+        static const ankerl::unordered_set<GLenum> VALID_CAPS = {
                 GL_BLEND, GL_DEPTH_TEST, GL_STENCIL_TEST, GL_SCISSOR_TEST, GL_CULL_FACE,
                 GL_POLYGON_OFFSET_FILL, GL_SAMPLE_ALPHA_TO_COVERAGE, GL_SAMPLE_COVERAGE
         }; // OpenGL 3
     }
     
     namespace Framebuffer {
-        static const std::unordered_set<GLenum> VALID_ATTACHMENTS = {
+        static const ankerl::unordered_set<GLenum> VALID_ATTACHMENTS = {
                 GL_COLOR_ATTACHMENT0, GL_DEPTH_ATTACHMENT,
                 GL_STENCIL_ATTACHMENT, GL_DEPTH_STENCIL_ATTACHMENT
         }; // OpenGL 3
         
-        static const std::unordered_set<GLenum> VALID_TARGETS = {
+        static const ankerl::unordered_set<GLenum> VALID_TARGETS = {
                 GL_FRAMEBUFFER, GL_DRAW_FRAMEBUFFER, GL_READ_FRAMEBUFFER
         }; // OpenGL 3
         
-        static const std::unordered_set<GLenum> VALID_ACCESS = {
+        static const ankerl::unordered_set<GLenum> VALID_ACCESS = {
                 GL_READ_ONLY, GL_WRITE_ONLY, GL_READ_WRITE
         }; // OpenGL 3
     }
     
     namespace Buffer {
-        static const std::unordered_set<GLenum> VALID_PARAM_NAMES = {
+        static const ankerl::unordered_set<GLenum> VALID_PARAM_NAMES = {
                 GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, GL_BUFFER_USAGE
         }; // OpenGL 3
         
-        static const std::unordered_set<GLenum> VALID_TARGETS = { 
+        static const ankerl::unordered_set<GLenum> VALID_TARGETS = { 
                 GL_ARRAY_BUFFER, GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, GL_ELEMENT_ARRAY_BUFFER,
                 GL_PIXEL_PACK_BUFFER, GL_PIXEL_UNPACK_BUFFER, GL_TEXTURE_BUFFER,
                 GL_TRANSFORM_FEEDBACK_BUFFER,  GL_UNIFORM_BUFFER
         }; // OpenGL 3
         
-        static const std::unordered_set<GLenum> VALID_ACCESS = {
+        static const ankerl::unordered_set<GLenum> VALID_ACCESS = {
                 GL_READ_ONLY, GL_WRITE_ONLY, GL_READ_WRITE
         }; // OpenGL 3
     }
 
     namespace PixelStore {
-        static const std::unordered_map<GLenum, GLint> DEFAULT_VALUES_MAP = {
+        static const ankerl::unordered_map<GLenum, GLint> DEFAULT_VALUES_MAP = {
                 {GL_PACK_SWAP_BYTES,   GL_FALSE},
                 {GL_PACK_LSB_FIRST,    GL_FALSE},
                 {GL_PACK_ROW_LENGTH,   0},
@@ -96,7 +111,7 @@ namespace MG_Constants {
                 {GL_UNPACK_ALIGNMENT,  4}
         }; // OpenGL 3
         
-        static const std::unordered_set<GLenum> VALID_PARAM_NAMES = {
+        static const ankerl::unordered_set<GLenum> VALID_PARAM_NAMES = {
                 GL_PACK_SWAP_BYTES, GL_PACK_LSB_FIRST, GL_PACK_ROW_LENGTH, GL_PACK_IMAGE_HEIGHT,
                 GL_PACK_SKIP_ROWS, GL_PACK_SKIP_PIXELS, GL_PACK_SKIP_IMAGES, GL_PACK_ALIGNMENT,
                 GL_UNPACK_SWAP_BYTES, GL_UNPACK_LSB_FIRST, GL_UNPACK_ROW_LENGTH,
@@ -110,18 +125,18 @@ namespace MG_Constants {
         inline const GLuint MAX_TEXTURE_UNITS = 80;
         const GLsizei MAX_TEXTURE_SIZE = 32768;
         const GLsizei MAX_ARRAY_LAYERS = 256;
-        inline const std::unordered_set<GLenum> VALID_TARGETS = {
+        inline const ankerl::unordered_set<GLenum> VALID_TARGETS = {
                 GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_1D_ARRAY, GL_PROXY_TEXTURE_1D_ARRAY,
                 GL_TEXTURE_RECTANGLE, GL_PROXY_TEXTURE_RECTANGLE, GL_TEXTURE_CUBE_MAP_POSITIVE_X,
                 GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 
                 GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, GL_PROXY_TEXTURE_CUBE_MAP
         }; // OpenGL 3
 
-        inline const std::unordered_set<GLenum> VALID_FORMATS = {
+        inline const ankerl::unordered_set<GLenum> VALID_FORMATS = {
                 GL_RED, GL_RG, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_DEPTH_COMPONENT, GL_DEPTH_STENCIL
         }; // OpenGL 3
 
-        inline const std::unordered_set<GLenum> VALID_INTERNAL_FORMATS = {
+        inline const ankerl::unordered_set<GLenum> VALID_INTERNAL_FORMATS = {
                 GL_RED, GL_RG, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_DEPTH_COMPONENT, GL_DEPTH_STENCIL,
                 GL_RGBA32F, GL_RGBA32I, GL_RGBA32UI, GL_RGBA16, GL_RGBA16F, GL_RGBA16I, 
                 GL_RGBA16UI, GL_RGBA8, GL_RGBA8UI, GL_SRGB8_ALPHA8, GL_RGB10_A2, GL_RGB10_A2UI, 
@@ -136,7 +151,7 @@ namespace MG_Constants {
                 GL_DEPTH32F_STENCIL8, GL_DEPTH24_STENCIL8
         }; // OpenGL 3
 
-        inline const std::unordered_set<GLenum> VALID_TYPES = {
+        inline const ankerl::unordered_set<GLenum> VALID_TYPES = {
                 GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, 
                 GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, 
                 GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV,
@@ -144,14 +159,14 @@ namespace MG_Constants {
                 GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, GL_UNSIGNED_INT_2_10_10_10_REV
         }; // OpenGL 3
 
-        inline const std::unordered_set<GLenum> VALID_TEXTURE_PARAM_NAMES = {
+        inline const ankerl::unordered_set<GLenum> VALID_TEXTURE_PARAM_NAMES = {
                 GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_COMPARE_FUNC, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_MIN_FILTER, 
                 GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_SWIZZLE_R, GL_TEXTURE_SWIZZLE_G,
                 GL_TEXTURE_SWIZZLE_B, GL_TEXTURE_SWIZZLE_A, GL_TEXTURE_SWIZZLE_RGBA, GL_TEXTURE_WRAP_S,
                 GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_LOD_BIAS, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BORDER_COLOR
         }; // OpenGL 3
         
-        inline const std::unordered_set<GLenum> VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES = {
+        inline const ankerl::unordered_set<GLenum> VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES = {
                 GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT,
                 GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE,
                 GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, GL_TEXTURE_COMPRESSED_IMAGE_SIZE

MG/Global.h

@@ -13,7 +13,7 @@ namespace MG_Global {
         inline const int VersionMinor = 0;
         inline const int VersionRevision = 0;
         inline const int VersionPatch = 0;
-        inline const std::string VersionSuffix = "-Dev";
+        inline const std::string VersionSuffix = "-ShittilyDraw";
     }
     
     namespace Backend {
@@ -22,7 +22,7 @@ namespace MG_Global {
     
     namespace GL {
         inline const int GLVersionMajor = 3;
-        inline const int GLVersionMinor = 0;
+        inline const int GLVersionMinor = 2;
         inline const int GLVersionRevision = 0;
     }
     

MG/Includes.h

@@ -84,8 +84,6 @@
 #include <cstring>
 #include <iostream>
 #include <cstdio>
-#include <dlfcn.h>
-#include <unistd.h>
 #include <ctime>
 #include <chrono>
 #include <thread>
@@ -103,7 +101,6 @@
 #include <unordered_map>
 #include <queue>
 #include <format>
-#include <vulkan/vulkan.h>
 #include <glslang/Public/ShaderLang.h>
 #include <glslang/Include/Types.h>
 #include <glslang/Public/ShaderLang.h>
@@ -112,10 +109,16 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/glm.hpp>
 #include <ankerl/unordered_dense.h>
-#include "GLES/gl32.h"
+#include <GLES3/gl32.h>
 
 #include "MG_Include/UncertainBool.hpp"
 
+#ifndef _WIN32
+#include <dlfcn.h>
+#include <unistd.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #ifdef __ANDROID__
 #include <android/log.h>
 #include <pthread.h>

MG/MG_GL/Implementations/EGL/VK/EGL_EMU.cpp

@@ -11,9 +11,9 @@ std::atomic<uintptr_t> g_nextSurfaceId{1};
 EGLenum g_currentAPI = EGL_OPENGL_ES_API;
 
 std::mutex g_globalMutex;
-std::unordered_map<EGLDisplay, VulkanDisplay> g_displays;
-std::unordered_map<EGLSurface, VulkanSurface> g_surfaces;
-std::unordered_map<EGLContext, VulkanContext> g_contexts;
+ankerl::unordered_map<EGLDisplay, VulkanDisplay> g_displays;
+ankerl::unordered_map<EGLSurface, VulkanSurface> g_surfaces;
+ankerl::unordered_map<EGLContext, VulkanContext> g_contexts;
 EGLint g_lastError = EGL_SUCCESS;
 
 thread_local EGLContext tls_currentContext = EGL_NO_CONTEXT;

MG/MG_GL/Implementations/EGL/VK/EGL_EMU.h

@@ -69,9 +69,9 @@ extern std::atomic<uintptr_t> g_nextSurfaceId;
 extern EGLenum g_currentAPI;
 
 extern std::mutex g_globalMutex;
-extern std::unordered_map<EGLDisplay, VulkanDisplay> g_displays;
-extern std::unordered_map<EGLSurface, VulkanSurface> g_surfaces;
-extern std::unordered_map<EGLContext, VulkanContext> g_contexts;
+extern ankerl::unordered_map<EGLDisplay, VulkanDisplay> g_displays;
+extern ankerl::unordered_map<EGLSurface, VulkanSurface> g_surfaces;
+extern ankerl::unordered_map<EGLContext, VulkanContext> g_contexts;
 extern EGLint g_lastError;
 
 extern thread_local EGLContext tls_currentContext;

MG/MG_GL/Implementations/GL/GLFuncsDefinitions/GLFuncsDefinitions.cpp

@@ -820,7 +820,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, ProvokingVertex, GLenum mode) DECLARE_GL_FUN
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexImage2DMultisample, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexImage2DMultisample,target,samples,internalformat,width,height,fixedsamplelocations)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexImage3DMultisample, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexImage3DMultisample,target,samples,internalformat,width,height,depth,fixedsamplelocations)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindFragDataLocationIndexed, GLuint program, GLuint colorNumber, GLuint index, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindFragDataLocationIndexed,program,colorNumber,index,name)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetFragDataIndex, GLuint program, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetFragDataIndex,program,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetFragDataIndex, GLuint program, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLint, GetFragDataIndex,program,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, QueryCounter, GLuint id, GLenum target) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, QueryCounter,id,target)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetQueryObjecti64v, GLuint id, GLenum pname, GLint64* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetQueryObjecti64v,id,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetQueryObjectui64v, GLuint id, GLenum pname, GLuint64* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetQueryObjectui64v,id,pname,params)
@@ -880,8 +880,8 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformMatrix3x4dv, GLint location, GLsizei
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformMatrix4x2dv, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformMatrix4x2dv,location,count,transpose,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformMatrix4x3dv, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformMatrix4x3dv,location,count,transpose,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetUniformdv, GLuint program, GLint location, GLdouble* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetUniformdv,program,location,params)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetSubroutineUniformLocation, GLuint program, GLenum shadertype, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetSubroutineUniformLocation,program,shadertype,name)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetSubroutineIndex, GLuint program, GLenum shadertype, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GetSubroutineIndex,program,shadertype,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetSubroutineUniformLocation, GLuint program, GLenum shadertype, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLint, GetSubroutineUniformLocation,program,shadertype,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetSubroutineIndex, GLuint program, GLenum shadertype, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLuint, GetSubroutineIndex,program,shadertype,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetActiveSubroutineUniformiv, GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetActiveSubroutineUniformiv,program,shadertype,index,pname,values)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetActiveSubroutineUniformName, GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei* length, GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetActiveSubroutineUniformName,program,shadertype,index,bufSize,length,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetActiveSubroutineName, GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei* length, GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetActiveSubroutineName,program,shadertype,index,bufSize,length,name)
@@ -946,7 +946,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, InvalidateBufferSubData, GLuint buffer, GLin
 DECLARE_GL_FUNCTION_STUB_HEAD(void, InvalidateBufferData, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, InvalidateBufferData,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawArraysIndirect, GLenum mode, const void* indirect, GLsizei drawcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawArraysIndirect,mode,indirect,drawcount,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawElementsIndirect, GLenum mode, GLenum type, const void* indirect, GLsizei drawcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawElementsIndirect,mode,type,indirect,drawcount,stride)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetProgramResourceLocationIndex, GLuint program, GLenum programInterface, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetProgramResourceLocationIndex,program,programInterface,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetProgramResourceLocationIndex, GLuint program, GLenum programInterface, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLint, GetProgramResourceLocationIndex,program,programInterface,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ShaderStorageBlockBinding, GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ShaderStorageBlockBinding,program,storageBlockIndex,storageBlockBinding)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TextureView, GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TextureView,texture,target,origtexture,internalformat,minlevel,numlevels,minlayer,numlayers)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribLFormat, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribLFormat,attribindex,size,type,relativeoffset)
@@ -973,7 +973,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedBufferSubData, GLuint buffer, GLintptr
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CopyNamedBufferSubData, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CopyNamedBufferSubData,readBuffer,writeBuffer,readOffset,writeOffset,size)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearNamedBufferData, GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearNamedBufferData,buffer,internalformat,format,type,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearNamedBufferSubData, GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearNamedBufferSubData,buffer,internalformat,offset,size,format,type,data)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, UnmapNamedBuffer, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, UnmapNamedBuffer,buffer)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, UnmapNamedBuffer, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END(GLboolean, UnmapNamedBuffer,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FlushMappedNamedBufferRange, GLuint buffer, GLintptr offset, GLsizeiptr length) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FlushMappedNamedBufferRange,buffer,offset,length)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferParameteriv, GLuint buffer, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferParameteriv,buffer,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferParameteri64v, GLuint buffer, GLenum pname, GLint64* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferParameteri64v,buffer,pname,params)
@@ -994,7 +994,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearNamedFramebufferuiv, GLuint framebuffer
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearNamedFramebufferfv, GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat* value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearNamedFramebufferfv,framebuffer,buffer,drawbuffer,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearNamedFramebufferfi, GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearNamedFramebufferfi,framebuffer,buffer,drawbuffer,depth,stencil)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlitNamedFramebuffer, GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlitNamedFramebuffer,readFramebuffer,drawFramebuffer,srcX0,srcY0,srcX1,srcY1,dstX0,dstY0,dstX1,dstY1,mask,filter)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, CheckNamedFramebufferStatus, GLuint framebuffer, GLenum target) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, CheckNamedFramebufferStatus,framebuffer,target)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, CheckNamedFramebufferStatus, GLuint framebuffer, GLenum target) DECLARE_GL_FUNCTION_STUB_END(GLenum, CheckNamedFramebufferStatus,framebuffer,target)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedFramebufferParameteriv, GLuint framebuffer, GLenum pname, GLint* param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedFramebufferParameteriv,framebuffer,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedFramebufferAttachmentParameteriv, GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedFramebufferAttachmentParameteriv,framebuffer,attachment,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CreateRenderbuffers, GLsizei n, GLuint* renderbuffers) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CreateRenderbuffers,n,renderbuffers)
@@ -1077,23 +1077,23 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, SpecializeShader, GLuint shader, const GLcha
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawArraysIndirectCount, GLenum mode, const void* indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawArraysIndirectCount,mode,indirect,drawcount,maxdrawcount,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawElementsIndirectCount, GLenum mode, GLenum type, const void* indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawElementsIndirectCount,mode,type,indirect,drawcount,maxdrawcount,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PolygonOffsetClamp, GLfloat factor, GLfloat units, GLfloat clamp) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PolygonOffsetClamp,factor,units,clamp)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureHandleARB, GLuint texture) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetTextureHandleARB,texture)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureSamplerHandleARB, GLuint texture, GLuint sampler) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetTextureSamplerHandleARB,texture,sampler)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureHandleARB, GLuint texture) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetTextureHandleARB,texture)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureSamplerHandleARB, GLuint texture, GLuint sampler) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetTextureSamplerHandleARB,texture,sampler)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeTextureHandleResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeTextureHandleResidentARB,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeTextureHandleNonResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeTextureHandleNonResidentARB,handle)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetImageHandleARB, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetImageHandleARB,texture,level,layered,layer,format)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetImageHandleARB, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetImageHandleARB,texture,level,layered,layer,format)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeImageHandleResidentARB, GLuint64 handle, GLenum access) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeImageHandleResidentARB,handle,access)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeImageHandleNonResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeImageHandleNonResidentARB,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformHandleui64ARB, GLint location, GLuint64 value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformHandleui64ARB,location,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformHandleui64vARB, GLint location, GLsizei count, const GLuint64* value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformHandleui64vARB,location,count,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramUniformHandleui64ARB, GLuint program, GLint location, GLuint64 value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramUniformHandleui64ARB,program,location,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramUniformHandleui64vARB, GLuint program, GLint location, GLsizei count, const GLuint64* values) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramUniformHandleui64vARB,program,location,count,values)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTextureHandleResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsTextureHandleResidentARB,handle)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsImageHandleResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsImageHandleResidentARB,handle)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTextureHandleResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsTextureHandleResidentARB,handle)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsImageHandleResidentARB, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsImageHandleResidentARB,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribL1ui64ARB, GLuint index, GLuint64EXT x) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribL1ui64ARB,index,x)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribL1ui64vARB, GLuint index, const GLuint64EXT* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribL1ui64vARB,index,v)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribLui64vARB, GLuint index, GLenum pname, GLuint64EXT* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVertexAttribLui64vARB,index,pname,params)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLsync, CreateSyncFromCLeventARB,struct _cl_context *context, struct _cl_event *event, GLbitfield flags) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLsync, CreateSyncFromCLeventARB,context,event,flags)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLsync, CreateSyncFromCLeventARB,struct _cl_context *context, struct _cl_event *event, GLbitfield flags) DECLARE_GL_FUNCTION_STUB_END(GLsync, CreateSyncFromCLeventARB,context,event,flags)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClampColorARB, GLenum target, GLenum clamp) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClampColorARB,target,clamp)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DispatchComputeGroupSizeARB, GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DispatchComputeGroupSizeARB,num_groups_x,num_groups_y,num_groups_z,group_size_x,group_size_y,group_size_z)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramStringARB, GLenum target, GLenum format, GLsizei len, const void* string) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramStringARB,target,format,len,string)
@@ -1246,10 +1246,10 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, FramebufferSampleLocationsfvARB, GLenum targ
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedFramebufferSampleLocationsfvARB, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedFramebufferSampleLocationsfvARB,framebuffer,start,count,v)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EvaluateDepthValuesARB,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EvaluateDepthValuesARB,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteObjectARB, GLhandleARB obj) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteObjectARB,obj)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, GetHandleARB, GLenum pname) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLhandleARB, GetHandleARB,pname)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, GetHandleARB, GLenum pname) DECLARE_GL_FUNCTION_STUB_END(GLhandleARB, GetHandleARB,pname)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DetachObjectARB, GLhandleARB containerObj, GLhandleARB attachedObj) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DetachObjectARB,containerObj,attachedObj)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, CreateShaderObjectARB, GLenum shaderType) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLhandleARB, CreateShaderObjectARB,shaderType)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, CreateProgramObjectARB,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLhandleARB, CreateProgramObjectARB,)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, CreateShaderObjectARB, GLenum shaderType) DECLARE_GL_FUNCTION_STUB_END(GLhandleARB, CreateShaderObjectARB,shaderType)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLhandleARB, CreateProgramObjectARB,void) DECLARE_GL_FUNCTION_STUB_END(GLhandleARB, CreateProgramObjectARB,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, AttachObjectARB, GLhandleARB containerObj, GLhandleARB obj) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, AttachObjectARB,containerObj,obj)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UseProgramObjectARB, GLhandleARB programObj) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UseProgramObjectARB,programObj)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetObjectParameterfvARB, GLhandleARB obj, GLenum pname, GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetObjectParameterfvARB,obj,pname,params)
@@ -1259,7 +1259,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetAttachedObjectsARB, GLhandleARB container
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedStringARB, GLenum type, GLint namelen, const GLchar* name, GLint strinen, const GLchar* string) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedStringARB,type,namelen,name,strinen,string)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteNamedStringARB, GLint namelen, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteNamedStringARB,namelen,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CompileShaderIncludeARB, GLuint shader, GLsizei count, const GLchar* const*path, const GLint* length) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CompileShaderIncludeARB,shader,count,path,length)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNamedStringARB, GLint namelen, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsNamedStringARB,namelen,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNamedStringARB, GLint namelen, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsNamedStringARB,namelen,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedStringARB, GLint namelen, const GLchar* name, GLsizei bufSize, GLint* strinen, GLchar* string) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedStringARB,namelen,name,bufSize,strinen,string)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedStringivARB, GLint namelen, const GLchar* name, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedStringivARB,namelen,name,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BufferPageCommitmentARB, GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BufferPageCommitmentARB,target,offset,size,commit)
@@ -1458,7 +1458,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, Vertex3xOES, GLfixed x, GLfixed y) DECLARE_G
 DECLARE_GL_FUNCTION_STUB_HEAD(void, Vertex3xvOES,const GLfixed* coords) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, Vertex3xvOES,coords)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, Vertex4xOES, GLfixed x, GLfixed y, GLfixed z) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, Vertex4xOES,x,y,z)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, Vertex4xvOES,const GLfixed* coords) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, Vertex4xvOES,coords)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLbitfield, QueryMatrixxOES, GLfixed* mantissa, GLint* exponent) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLbitfield, QueryMatrixxOES,mantissa,exponent)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLbitfield, QueryMatrixxOES, GLfixed* mantissa, GLint* exponent) DECLARE_GL_FUNCTION_STUB_END(GLbitfield, QueryMatrixxOES,mantissa,exponent)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearDepthfOES, GLclampf depth) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearDepthfOES,depth)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClipPlanefOES, GLenum plane, const GLfloat* equation) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClipPlanefOES,plane,equation)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DepthRangefOES, GLclampf n, GLclampf f) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DepthRangefOES,n,f)
@@ -1469,7 +1469,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, TbufferMask3DFX, GLuint mask) DECLARE_GL_FUN
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DebugMessageEnableAMD, GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DebugMessageEnableAMD,category,severity,count,ids,enabled)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DebugMessageInsertAMD, GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DebugMessageInsertAMD,category,severity,id,length,buf)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DebugMessageCallbackAMD, GLDEBUGPROCAMD callback, void* userParam) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DebugMessageCallbackAMD,callback,userParam)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetDebugMessageLogAMD, GLuint count, GLsizei bufSize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GetDebugMessageLogAMD,count,bufSize,categories,severities,ids,lengths,message)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetDebugMessageLogAMD, GLuint count, GLsizei bufSize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message) DECLARE_GL_FUNCTION_STUB_END(GLuint, GetDebugMessageLogAMD,count,bufSize,categories,severities,ids,lengths,message)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlendFuncIndexedAMD, GLuint buf, GLenum src, GLenum dst) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlendFuncIndexedAMD,buf,src,dst)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlendFuncSeparateIndexedAMD, GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlendFuncSeparateIndexedAMD,buf,srcRGB,dstRGB,srcAlpha,dstAlpha)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlendEquationIndexedAMD, GLuint buf, GLenum mode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlendEquationIndexedAMD,buf,mode)
@@ -1519,7 +1519,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawArraysIndirectAMD, GLenum mode, con
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawElementsIndirectAMD, GLenum mode, GLenum type, const void* indirect, GLsizei primcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawElementsIndirectAMD,mode,type,indirect,primcount,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenNamesAMD, GLenum identifier, GLuint num, GLuint* names) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenNamesAMD,identifier,num,names)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteNamesAMD, GLenum identifier, GLuint num, const GLuint* names) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteNamesAMD,identifier,num,names)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNameAMD, GLenum identifier, GLuint name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsNameAMD,identifier,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNameAMD, GLenum identifier, GLuint name) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsNameAMD,identifier,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, QueryObjectParameteruiAMD, GLenum target, GLuint id, GLenum pname, GLuint param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, QueryObjectParameteruiAMD,target,id,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPerfMonitorGroupsAMD, GLint* numGroups, GLsizei groupsSize, GLuint* groups) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPerfMonitorGroupsAMD,numGroups,groupsSize,groups)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPerfMonitorCountersAMD, GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPerfMonitorCountersAMD,group,numCounters,maxActiveCounters,counterSize,counters)
@@ -1546,28 +1546,28 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawRangeElementArrayAPPLE, GLenum mode
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenFencesAPPLE, GLsizei n, GLuint* fences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenFencesAPPLE,n,fences)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteFencesAPPLE, GLsizei n, const GLuint* fences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteFencesAPPLE,n,fences)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SetFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SetFenceAPPLE,fence)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsFenceAPPLE,fence)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, TestFenceAPPLE,fence)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsFenceAPPLE,fence)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END(GLboolean, TestFenceAPPLE,fence)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FinishFenceAPPLE, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FinishFenceAPPLE,fence)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestObjectAPPLE, GLenum object, GLuint name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, TestObjectAPPLE,object,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestObjectAPPLE, GLenum object, GLuint name) DECLARE_GL_FUNCTION_STUB_END(GLboolean, TestObjectAPPLE,object,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FinishObjectAPPLE, GLenum object, GLint name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FinishObjectAPPLE,object,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BufferParameteriAPPLE, GLenum target, GLenum pname, GLint param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BufferParameteriAPPLE,target,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FlushMappedBufferRangeAPPLE, GLenum target, GLintptr offset, GLsizeiptr size) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FlushMappedBufferRangeAPPLE,target,offset,size)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, ObjectPurgeableAPPLE, GLenum objectType, GLuint name, GLenum option) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, ObjectPurgeableAPPLE,objectType,name,option)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, ObjectUnpurgeableAPPLE, GLenum objectType, GLuint name, GLenum option) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, ObjectUnpurgeableAPPLE,objectType,name,option)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, ObjectPurgeableAPPLE, GLenum objectType, GLuint name, GLenum option) DECLARE_GL_FUNCTION_STUB_END(GLenum, ObjectPurgeableAPPLE,objectType,name,option)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, ObjectUnpurgeableAPPLE, GLenum objectType, GLuint name, GLenum option) DECLARE_GL_FUNCTION_STUB_END(GLenum, ObjectUnpurgeableAPPLE,objectType,name,option)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetObjectParameterivAPPLE, GLenum objectType, GLuint name, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetObjectParameterivAPPLE,objectType,name,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TextureRangeAPPLE, GLenum target, GLsizei length, const void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TextureRangeAPPLE,target,length,pointer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetTexParameterPointervAPPLE, GLenum target, GLenum pname, void* *params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetTexParameterPointervAPPLE,target,pname,*params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindVertexArrayAPPLE, GLuint array) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindVertexArrayAPPLE,array)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteVertexArraysAPPLE, GLsizei n, const GLuint* arrays) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteVertexArraysAPPLE,n,arrays)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenVertexArraysAPPLE, GLsizei n, GLuint* arrays) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenVertexArraysAPPLE,n,arrays)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVertexArrayAPPLE, GLuint array) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsVertexArrayAPPLE,array)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVertexArrayAPPLE, GLuint array) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsVertexArrayAPPLE,array)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexArrayRangeAPPLE, GLsizei length, void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexArrayRangeAPPLE,length,pointer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FlushVertexArrayRangeAPPLE, GLsizei length, void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FlushVertexArrayRangeAPPLE,length,pointer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexArrayParameteriAPPLE, GLenum pname, GLint param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexArrayParameteriAPPLE,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EnableVertexAttribAPPLE, GLuint index, GLenum pname) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EnableVertexAttribAPPLE,index,pname)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DisableVertexAttribAPPLE, GLuint index, GLenum pname) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DisableVertexAttribAPPLE,index,pname)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVertexAttribEnabledAPPLE, GLuint index, GLenum pname) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsVertexAttribEnabledAPPLE,index,pname)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVertexAttribEnabledAPPLE, GLuint index, GLenum pname) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsVertexAttribEnabledAPPLE,index,pname)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MapVertexAttrib1dAPPLE, GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble* points) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MapVertexAttrib1dAPPLE,index,size,u1,u2,stride,order,points)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MapVertexAttrib1fAPPLE, GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat* points) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MapVertexAttrib1fAPPLE,index,size,u1,u2,stride,order,points)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MapVertexAttrib2dAPPLE, GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble* points) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MapVertexAttrib2dAPPLE,index,size,u1,u2,ustride,uorder,v1,v2,vstride,vorder,points)
@@ -1580,7 +1580,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, TexBumpParameterivATI, GLenum pname, const G
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexBumpParameterfvATI, GLenum pname, const GLfloat* param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexBumpParameterfvATI,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetTexBumpParameterivATI, GLenum pname, GLint* param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetTexBumpParameterivATI,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetTexBumpParameterfvATI, GLenum pname, GLfloat* param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetTexBumpParameterfvATI,pname,param)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenFragmentShadersATI, GLuint range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GenFragmentShadersATI,range)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenFragmentShadersATI, GLuint range) DECLARE_GL_FUNCTION_STUB_END(GLuint, GenFragmentShadersATI,range)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindFragmentShaderATI, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindFragmentShaderATI,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteFragmentShaderATI, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteFragmentShaderATI,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BeginFragmentShaderATI,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BeginFragmentShaderATI,)
@@ -1599,8 +1599,8 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, PNTrianesiATI, GLenum pname, GLint param) DE
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PNTrianesfATI, GLenum pname, GLfloat param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PNTrianesfATI,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilOpSeparateATI, GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilOpSeparateATI,face,sfail,dpfail,dppass)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilFuncSeparateATI, GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilFuncSeparateATI,frontfunc,backfunc,ref,mask)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, NewObjectBufferATI, GLsizei size, const void* pointer, GLenum usage) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, NewObjectBufferATI,size,pointer,usage)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsObjectBufferATI, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsObjectBufferATI,buffer)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, NewObjectBufferATI, GLsizei size, const void* pointer, GLenum usage) DECLARE_GL_FUNCTION_STUB_END(GLuint, NewObjectBufferATI,size,pointer,usage)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsObjectBufferATI, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsObjectBufferATI,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UpdateObjectBufferATI, GLuint buffer, GLuint offset, GLsizei size, const void* pointer, GLenum preserve) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UpdateObjectBufferATI,buffer,offset,size,pointer,preserve)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetObjectBufferfvATI, GLuint buffer, GLenum pname, GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetObjectBufferfvATI,buffer,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetObjectBufferivATI, GLuint buffer, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetObjectBufferivATI,buffer,pname,params)
@@ -1662,8 +1662,8 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexBlendEnvfATI, GLenum pname, GLfloat pa
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EGLImageTargetTexStorageEXT, GLenum target, GLeglImageOES image, const GLint*  attrib_list) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EGLImageTargetTexStorageEXT,target,image,attrib_list)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EGLImageTargetTextureStorageEXT, GLuint texture, GLeglImageOES image, const GLint*  attrib_list) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EGLImageTargetTextureStorageEXT,texture,image,attrib_list)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformBufferEXT, GLuint program, GLint location, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformBufferEXT,program,location,buffer)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetUniformBufferSizeEXT, GLuint program, GLint location) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetUniformBufferSizeEXT,program,location)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLintptr, GetUniformOffsetEXT, GLuint program, GLint location) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLintptr, GetUniformOffsetEXT,program,location)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetUniformBufferSizeEXT, GLuint program, GLint location) DECLARE_GL_FUNCTION_STUB_END(GLint, GetUniformBufferSizeEXT,program,location)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLintptr, GetUniformOffsetEXT, GLuint program, GLint location) DECLARE_GL_FUNCTION_STUB_END(GLintptr, GetUniformOffsetEXT,program,location)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ColorSubTableEXT, GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ColorSubTableEXT,target,start,count,format,type,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CopyColorSubTableEXT, GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CopyColorSubTableEXT,target,start,x,y,width)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LockArraysEXT, GLint first, GLsizei count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LockArraysEXT,first,count)
@@ -1793,7 +1793,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetDoubleIndexedvEXT, GLenum target, GLuint
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPointerIndexedvEXT, GLenum target, GLuint index, void* *data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPointerIndexedvEXT,target,index,*data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EnableIndexedEXT, GLenum target, GLuint index) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EnableIndexedEXT,target,index)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DisableIndexedEXT, GLenum target, GLuint index) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DisableIndexedEXT,target,index)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsEnabledIndexedEXT, GLenum target, GLuint index) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsEnabledIndexedEXT,target,index)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsEnabledIndexedEXT, GLenum target, GLuint index) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsEnabledIndexedEXT,target,index)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetIntegerIndexedvEXT, GLenum target, GLuint index, GLint* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetIntegerIndexedvEXT,target,index,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetBooleanIndexedvEXT, GLenum target, GLuint index, GLboolean* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetBooleanIndexedvEXT,target,index,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CompressedTextureImage3DEXT, GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* bits) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CompressedTextureImage3DEXT,texture,target,level,internalformat,width,height,depth,border,imageSize,bits)
@@ -1816,7 +1816,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, MatrixMultTransposefEXT, GLenum mode, const
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MatrixMultTransposedEXT, GLenum mode, const GLdouble* m) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MatrixMultTransposedEXT,mode,m)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedBufferDataEXT, GLuint buffer, GLsizeiptr size, const void* data, GLenum usage) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedBufferDataEXT,buffer,size,data,usage)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedBufferSubDataEXT, GLuint buffer, GLintptr offset, GLsizeiptr size, const void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedBufferSubDataEXT,buffer,offset,size,data)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, UnmapNamedBufferEXT, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, UnmapNamedBufferEXT,buffer)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, UnmapNamedBufferEXT, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END(GLboolean, UnmapNamedBufferEXT,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferParameterivEXT, GLuint buffer, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferParameterivEXT,buffer,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferPointervEXT, GLuint buffer, GLenum pname, void* *params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferPointervEXT,buffer,pname,*params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferSubDataEXT, GLuint buffer, GLintptr offset, GLsizeiptr size, void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferSubDataEXT,buffer,offset,size,data)
@@ -1857,7 +1857,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedRenderbufferStorageEXT, GLuint renderbu
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedRenderbufferParameterivEXT, GLuint renderbuffer, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedRenderbufferParameterivEXT,renderbuffer,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedRenderbufferStorageMultisampleEXT, GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedRenderbufferStorageMultisampleEXT,renderbuffer,samples,internalformat,width,height)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedRenderbufferStorageMultisampleCoverageEXT, GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedRenderbufferStorageMultisampleCoverageEXT,renderbuffer,coverageSamples,colorSamples,internalformat,width,height)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, CheckNamedFramebufferStatusEXT, GLuint framebuffer, GLenum target) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, CheckNamedFramebufferStatusEXT,framebuffer,target)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, CheckNamedFramebufferStatusEXT, GLuint framebuffer, GLenum target) DECLARE_GL_FUNCTION_STUB_END(GLenum, CheckNamedFramebufferStatusEXT,framebuffer,target)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedFramebufferTexture1DEXT, GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedFramebufferTexture1DEXT,framebuffer,attachment,textarget,texture,level)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedFramebufferTexture2DEXT, GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedFramebufferTexture2DEXT,framebuffer,attachment,textarget,texture,level)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, NamedFramebufferTexture3DEXT, GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, NamedFramebufferTexture3DEXT,framebuffer,attachment,textarget,texture,level,zoffset)
@@ -1978,7 +1978,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, TextureMaterialEXT, GLenum face, GLenum mode
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetUnsignedBytevEXT, GLenum pname, GLubyte* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetUnsignedBytevEXT,pname,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetUnsignedBytei_vEXT, GLenum target, GLuint index, GLubyte* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetUnsignedBytei_vEXT,target,index,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteMemoryObjectsEXT, GLsizei n, const GLuint* memoryObjects) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteMemoryObjectsEXT,n,memoryObjects)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsMemoryObjectEXT, GLuint memoryObject) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsMemoryObjectEXT,memoryObject)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsMemoryObjectEXT, GLuint memoryObject) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsMemoryObjectEXT,memoryObject)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CreateMemoryObjectsEXT, GLsizei n, GLuint* memoryObjects) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CreateMemoryObjectsEXT,n,memoryObjects)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MemoryObjectParameterivEXT, GLuint memoryObject, GLenum pname, const GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MemoryObjectParameterivEXT,memoryObject,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetMemoryObjectParameterivEXT, GLuint memoryObject, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetMemoryObjectParameterivEXT,memoryObject,pname,params)
@@ -2035,7 +2035,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, SecondaryColor3usvEXT,const GLushort* v) DEC
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SecondaryColorPointerEXT, GLint size, GLenum type, GLsizei stride, const void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SecondaryColorPointerEXT,size,type,stride,pointer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenSemaphoresEXT, GLsizei n, GLuint* semaphores) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenSemaphoresEXT,n,semaphores)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteSemaphoresEXT, GLsizei n, const GLuint* semaphores) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteSemaphoresEXT,n,semaphores)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsSemaphoreEXT, GLuint semaphore) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsSemaphoreEXT,semaphore)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsSemaphoreEXT, GLuint semaphore) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsSemaphoreEXT,semaphore)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SemaphoreParameterui64vEXT, GLuint semaphore, GLenum pname, const GLuint64* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SemaphoreParameterui64vEXT,semaphore,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetSemaphoreParameterui64vEXT, GLuint semaphore, GLenum pname, GLuint64* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetSemaphoreParameterui64vEXT,semaphore,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, WaitSemaphoreEXT, GLuint semaphore, GLuint numBufferBarriers, const GLuint* buffers, GLuint numTextureBarriers, const GLuint* textures, const GLenum* srcLayouts) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, WaitSemaphoreEXT,semaphore,numBufferBarriers,buffers,numTextureBarriers,textures,srcLayouts)
@@ -2045,14 +2045,14 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, ImportSemaphoreWin32HandleEXT, GLuint semaph
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ImportSemaphoreWin32NameEXT, GLuint semaphore, GLenum handleType, const void* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ImportSemaphoreWin32NameEXT,semaphore,handleType,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UseShaderProgramEXT, GLenum type, GLuint program) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UseShaderProgramEXT,type,program)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ActiveProgramEXT, GLuint program) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ActiveProgramEXT,program)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, CreateShaderProgramEXT, GLenum type, const GLchar* string) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, CreateShaderProgramEXT,type,string)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, CreateShaderProgramEXT, GLenum type, const GLchar* string) DECLARE_GL_FUNCTION_STUB_END(GLuint, CreateShaderProgramEXT,type,string)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FramebufferFetchBarrierEXT,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FramebufferFetchBarrierEXT,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilClearTagEXT, GLsizei stencilTagBits, GLuint stencilClearTag) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilClearTagEXT,stencilTagBits,stencilClearTag)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ActiveStencilFaceEXT, GLenum face) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ActiveStencilFaceEXT,face)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexSubImage1DEXT, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexSubImage1DEXT,target,level,xoffset,width,format,type,pixels)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearColorIiEXT, GLint red, GLint green, GLint blue, GLint alpha) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearColorIiEXT,red,green,blue,alpha)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearColorIuiEXT, GLuint red, GLuint green, GLuint blue, GLuint alpha) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClearColorIuiEXT,red,green,blue,alpha)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AreTexturesResidentEXT, GLsizei n, const GLuint* textures, GLboolean* residences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, AreTexturesResidentEXT,n,textures,residences)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AreTexturesResidentEXT, GLsizei n, const GLuint* textures, GLboolean* residences) DECLARE_GL_FUNCTION_STUB_END(GLboolean, AreTexturesResidentEXT,n,textures,residences)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PrioritizeTexturesEXT, GLsizei n, const GLuint* textures, const GLclampf* priorities) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PrioritizeTexturesEXT,n,textures,priorities)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TextureNormalEXT, GLenum mode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TextureNormalEXT,mode)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexStorage1DEXT, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexStorage1DEXT,target,levels,internalformat,width)
@@ -2079,7 +2079,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribLdvEXT, GLuint index, GLenum
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BeginVertexShaderEXT,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BeginVertexShaderEXT,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EndVertexShaderEXT,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EndVertexShaderEXT,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindVertexShaderEXT, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindVertexShaderEXT,id)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenVertexShadersEXT, GLuint range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GenVertexShadersEXT,range)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenVertexShadersEXT, GLuint range) DECLARE_GL_FUNCTION_STUB_END(GLuint, GenVertexShadersEXT,range)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteVertexShaderEXT, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteVertexShaderEXT,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ShaderOp1EXT, GLenum op, GLuint res, GLuint arg1) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ShaderOp1EXT,op,res,arg1)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ShaderOp2EXT, GLenum op, GLuint res, GLuint arg1, GLuint arg2) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ShaderOp2EXT,op,res,arg1,arg2)
@@ -2088,7 +2088,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, SwizzleEXT, GLuint res, GLuint in, GLenum ou
 DECLARE_GL_FUNCTION_STUB_HEAD(void, WriteMaskEXT, GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, WriteMaskEXT,res,in,outX,outY,outZ,outW)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, InsertComponentEXT, GLuint res, GLuint src, GLuint num) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, InsertComponentEXT,res,src,num)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ExtractComponentEXT, GLuint res, GLuint src, GLuint num) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ExtractComponentEXT,res,src,num)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenSymbolsEXT, GLenum datatype, GLenum storagetype, GLenum range, GLuint components) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GenSymbolsEXT,datatype,storagetype,range,components)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenSymbolsEXT, GLenum datatype, GLenum storagetype, GLenum range, GLuint components) DECLARE_GL_FUNCTION_STUB_END(GLuint, GenSymbolsEXT,datatype,storagetype,range,components)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SetInvariantEXT, GLuint id, GLenum type, const void* addr) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SetInvariantEXT,id,type,addr)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SetLocalConstantEXT, GLuint id, GLenum type, const void* addr) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SetLocalConstantEXT,id,type,addr)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VariantbvEXT, GLuint id, const GLbyte* addr) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VariantbvEXT,id,addr)
@@ -2102,12 +2102,12 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, VariantuivEXT, GLuint id, const GLuint* addr
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VariantPointerEXT, GLuint id, GLenum type, GLuint stride, const void* addr) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VariantPointerEXT,id,type,stride,addr)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EnableVariantClientStateEXT, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EnableVariantClientStateEXT,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DisableVariantClientStateEXT, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DisableVariantClientStateEXT,id)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindLightParameterEXT, GLenum light, GLenum value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, BindLightParameterEXT,light,value)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindMaterialParameterEXT, GLenum face, GLenum value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, BindMaterialParameterEXT,face,value)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindTexGenParameterEXT, GLenum unit, GLenum coord, GLenum value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, BindTexGenParameterEXT,unit,coord,value)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindTextureUnitParameterEXT, GLenum unit, GLenum value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, BindTextureUnitParameterEXT,unit,value)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindParameterEXT, GLenum value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, BindParameterEXT,value)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVariantEnabledEXT, GLuint id, GLenum cap) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsVariantEnabledEXT,id,cap)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindLightParameterEXT, GLenum light, GLenum value) DECLARE_GL_FUNCTION_STUB_END(GLuint, BindLightParameterEXT,light,value)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindMaterialParameterEXT, GLenum face, GLenum value) DECLARE_GL_FUNCTION_STUB_END(GLuint, BindMaterialParameterEXT,face,value)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindTexGenParameterEXT, GLenum unit, GLenum coord, GLenum value) DECLARE_GL_FUNCTION_STUB_END(GLuint, BindTexGenParameterEXT,unit,coord,value)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindTextureUnitParameterEXT, GLenum unit, GLenum value) DECLARE_GL_FUNCTION_STUB_END(GLuint, BindTextureUnitParameterEXT,unit,value)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, BindParameterEXT, GLenum value) DECLARE_GL_FUNCTION_STUB_END(GLuint, BindParameterEXT,value)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsVariantEnabledEXT, GLuint id, GLenum cap) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsVariantEnabledEXT,id,cap)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVariantBooleanvEXT, GLuint id, GLenum value, GLboolean* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVariantBooleanvEXT,id,value,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVariantIntegervEXT, GLuint id, GLenum value, GLint* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVariantIntegervEXT,id,value,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVariantFloatvEXT, GLuint id, GLenum value, GLfloat* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVariantFloatvEXT,id,value,data)
@@ -2121,10 +2121,10 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetLocalConstantFloatvEXT, GLuint id, GLenum
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexWeightfEXT, GLfloat weight) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexWeightfEXT,weight)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexWeightfvEXT,const GLfloat* weight) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexWeightfvEXT,weight)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexWeightPointerEXT, GLint size, GLenum type, GLsizei stride, const void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexWeightPointerEXT,size,type,stride,pointer)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AcquireKeyedMutexWin32EXT, GLuint memory, GLuint64 key, GLuint timeout) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, AcquireKeyedMutexWin32EXT,memory,key,timeout)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, ReleaseKeyedMutexWin32EXT, GLuint memory, GLuint64 key) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, ReleaseKeyedMutexWin32EXT,memory,key)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AcquireKeyedMutexWin32EXT, GLuint memory, GLuint64 key, GLuint timeout) DECLARE_GL_FUNCTION_STUB_END(GLboolean, AcquireKeyedMutexWin32EXT,memory,key,timeout)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, ReleaseKeyedMutexWin32EXT, GLuint memory, GLuint64 key) DECLARE_GL_FUNCTION_STUB_END(GLboolean, ReleaseKeyedMutexWin32EXT,memory,key)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, WindowRectanesEXT, GLenum mode, GLsizei count, const GLint* box) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, WindowRectanesEXT,mode,count,box)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLsync, ImportSyncEXT, GLenum external_sync_type, GLintptr external_sync, GLbitfield flags) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLsync, ImportSyncEXT,external_sync_type,external_sync,flags)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLsync, ImportSyncEXT, GLenum external_sync_type, GLintptr external_sync, GLbitfield flags) DECLARE_GL_FUNCTION_STUB_END(GLsync, ImportSyncEXT,external_sync_type,external_sync,flags)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FrameTerminatorGREMEDY,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FrameTerminatorGREMEDY,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StringMarkerGREMEDY, GLsizei len, const void* string) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StringMarkerGREMEDY,len,string)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ImageTransformParameteriHP, GLenum target, GLenum pname, GLint param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ImageTransformParameteriHP,target,pname,param)
@@ -2195,12 +2195,12 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, UploadGpuMaskNVX, GLbitfield mask) DECLARE_G
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MulticastViewportArrayvNVX, GLuint gpu, GLuint first, GLsizei count, const GLfloat* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MulticastViewportArrayvNVX,gpu,first,count,v)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MulticastViewportPositionWScaleNVX, GLuint gpu, GLuint index, GLfloat xcoeff, GLfloat ycoeff) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MulticastViewportPositionWScaleNVX,gpu,index,xcoeff,ycoeff)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MulticastScissorArrayvNVX, GLuint gpu, GLuint first, GLsizei count, const GLint* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MulticastScissorArrayvNVX,gpu,first,count,v)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, AsyncCopyBufferSubDataNVX, GLsizei waitSemaphoreCount, const GLuint* waitSemaphoreArray, const GLuint64* fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint* signalSemaphoreArray, const GLuint64* signalValueArray) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, AsyncCopyBufferSubDataNVX,waitSemaphoreCount,waitSemaphoreArray,fenceValueArray,readGpu,writeGpuMask,readBuffer,writeBuffer,readOffset,writeOffset,size,signalSemaphoreCount,signalSemaphoreArray,signalValueArray)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, AsyncCopyImageSubDataNVX, GLsizei waitSemaphoreCount, const GLuint* waitSemaphoreArray, const GLuint64* waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint* signalSemaphoreArray, const GLuint64* signalValueArray) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, AsyncCopyImageSubDataNVX,waitSemaphoreCount,waitSemaphoreArray,waitValueArray,srcGpu,dstGpuMask,srcName,srcTarget,srcLevel,srcX,srcY,srcZ,dstName,dstTarget,dstLevel,dstX,dstY,dstZ,srcWidth,srcHeight,srcDepth,signalSemaphoreCount,signalSemaphoreArray,signalValueArray)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, AsyncCopyBufferSubDataNVX, GLsizei waitSemaphoreCount, const GLuint* waitSemaphoreArray, const GLuint64* fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint* signalSemaphoreArray, const GLuint64* signalValueArray) DECLARE_GL_FUNCTION_STUB_END(GLuint, AsyncCopyBufferSubDataNVX,waitSemaphoreCount,waitSemaphoreArray,fenceValueArray,readGpu,writeGpuMask,readBuffer,writeBuffer,readOffset,writeOffset,size,signalSemaphoreCount,signalSemaphoreArray,signalValueArray)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, AsyncCopyImageSubDataNVX, GLsizei waitSemaphoreCount, const GLuint* waitSemaphoreArray, const GLuint64* waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint* signalSemaphoreArray, const GLuint64* signalValueArray) DECLARE_GL_FUNCTION_STUB_END(GLuint, AsyncCopyImageSubDataNVX,waitSemaphoreCount,waitSemaphoreArray,waitValueArray,srcGpu,dstGpuMask,srcName,srcTarget,srcLevel,srcX,srcY,srcZ,dstName,dstTarget,dstLevel,dstX,dstY,dstZ,srcWidth,srcHeight,srcDepth,signalSemaphoreCount,signalSemaphoreArray,signalValueArray)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LGPUNamedBufferSubDataNVX, GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void* data) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LGPUNamedBufferSubDataNVX,gpuMask,buffer,offset,size,data)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LGPUCopyImageSubDataNVX, GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LGPUCopyImageSubDataNVX,sourceGpu,destinationGpuMask,srcName,srcTarget,srcLevel,srcX,srxY,srcZ,dstName,dstTarget,dstLevel,dstX,dstY,dstZ,width,height,depth)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LGPUInterlockNVX,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LGPUInterlockNVX,)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, CreateProgressFenceNVX,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, CreateProgressFenceNVX,)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, CreateProgressFenceNVX,void) DECLARE_GL_FUNCTION_STUB_END(GLuint, CreateProgressFenceNVX,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SignalSemaphoreui64NVX, GLuint signalGpu, GLsizei fenceObjectCount, const GLuint* semaphoreArray, const GLuint64* fenceValueArray) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SignalSemaphoreui64NVX,signalGpu,fenceObjectCount,semaphoreArray,fenceValueArray)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, WaitSemaphoreui64NVX, GLuint waitGpu, GLsizei fenceObjectCount, const GLuint* semaphoreArray, const GLuint64* fenceValueArray) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, WaitSemaphoreui64NVX,waitGpu,fenceObjectCount,semaphoreArray,fenceValueArray)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ClientWaitSemaphoreui64NVX, GLsizei fenceObjectCount, const GLuint* semaphoreArray, const GLuint64* fenceValueArray) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ClientWaitSemaphoreui64NVX,fenceObjectCount,semaphoreArray,fenceValueArray)
@@ -2209,35 +2209,35 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawArraysIndirectBindlessNV, GLenum mo
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawElementsIndirectBindlessNV, GLenum mode, GLenum type, const void* indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawElementsIndirectBindlessNV,mode,type,indirect,drawCount,stride,vertexBufferCount)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawArraysIndirectBindlessCountNV, GLenum mode, const void* indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawArraysIndirectBindlessCountNV,mode,indirect,drawCount,maxDrawCount,stride,vertexBufferCount)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawElementsIndirectBindlessCountNV, GLenum mode, GLenum type, const void* indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawElementsIndirectBindlessCountNV,mode,type,indirect,drawCount,maxDrawCount,stride,vertexBufferCount)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureHandleNV, GLuint texture) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetTextureHandleNV,texture)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureSamplerHandleNV, GLuint texture, GLuint sampler) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetTextureSamplerHandleNV,texture,sampler)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureHandleNV, GLuint texture) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetTextureHandleNV,texture)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetTextureSamplerHandleNV, GLuint texture, GLuint sampler) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetTextureSamplerHandleNV,texture,sampler)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeTextureHandleResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeTextureHandleResidentNV,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeTextureHandleNonResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeTextureHandleNonResidentNV,handle)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetImageHandleNV, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint64, GetImageHandleNV,texture,level,layered,layer,format)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint64, GetImageHandleNV, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format) DECLARE_GL_FUNCTION_STUB_END(GLuint64, GetImageHandleNV,texture,level,layered,layer,format)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeImageHandleResidentNV, GLuint64 handle, GLenum access) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeImageHandleResidentNV,handle,access)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeImageHandleNonResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeImageHandleNonResidentNV,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformHandleui64NV, GLint location, GLuint64 value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformHandleui64NV,location,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, UniformHandleui64vNV, GLint location, GLsizei count, const GLuint64* value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, UniformHandleui64vNV,location,count,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramUniformHandleui64NV, GLuint program, GLint location, GLuint64 value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramUniformHandleui64NV,program,location,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramUniformHandleui64vNV, GLuint program, GLint location, GLsizei count, const GLuint64* values) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramUniformHandleui64vNV,program,location,count,values)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTextureHandleResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsTextureHandleResidentNV,handle)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsImageHandleResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsImageHandleResidentNV,handle)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTextureHandleResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsTextureHandleResidentNV,handle)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsImageHandleResidentNV, GLuint64 handle) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsImageHandleResidentNV,handle)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlendParameteriNV, GLenum pname, GLint value) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlendParameteriNV,pname,value)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BlendBarrierNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BlendBarrierNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ViewportPositionWScaleNV, GLuint index, GLfloat xcoeff, GLfloat ycoeff) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ViewportPositionWScaleNV,index,xcoeff,ycoeff)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CreateStatesNV, GLsizei n, GLuint* states) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CreateStatesNV,n,states)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteStatesNV, GLsizei n, const GLuint* states) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteStatesNV,n,states)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsStateNV, GLuint state) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsStateNV,state)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsStateNV, GLuint state) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsStateNV,state)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StateCaptureNV, GLuint state, GLenum mode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StateCaptureNV,state,mode)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetCommandHeaderNV, GLenum tokenID, GLuint size) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GetCommandHeaderNV,tokenID,size)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLushort, GetStageIndexNV, GLenum shadertype) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLushort, GetStageIndexNV,shadertype)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GetCommandHeaderNV, GLenum tokenID, GLuint size) DECLARE_GL_FUNCTION_STUB_END(GLuint, GetCommandHeaderNV,tokenID,size)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLushort, GetStageIndexNV, GLenum shadertype) DECLARE_GL_FUNCTION_STUB_END(GLushort, GetStageIndexNV,shadertype)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawCommandsNV, GLenum primitiveMode, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, GLuint count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawCommandsNV,primitiveMode,buffer,indirects,sizes,count)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawCommandsAddressNV, GLenum primitiveMode, const GLuint64* indirects, const GLsizei* sizes, GLuint count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawCommandsAddressNV,primitiveMode,indirects,sizes,count)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawCommandsStatesNV, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawCommandsStatesNV,buffer,indirects,sizes,states,fbos,count)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawCommandsStatesAddressNV,const GLuint64* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawCommandsStatesAddressNV,indirects,sizes,states,fbos,count)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CreateCommandListsNV, GLsizei n, GLuint* lists) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CreateCommandListsNV,n,lists)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteCommandListsNV, GLsizei n, const GLuint* lists) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteCommandListsNV,n,lists)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsCommandListNV, GLuint list) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsCommandListNV,list)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsCommandListNV, GLuint list) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsCommandListNV,list)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ListDrawCommandsStatesClientNV, GLuint list, GLuint segment, const void* *indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ListDrawCommandsStatesClientNV,list,segment,indirects,sizes,states,fbos,count)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CommandListSegmentsNV, GLuint list, GLuint segments) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CommandListSegmentsNV,list,segments)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, CompileCommandListNV, GLuint list) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, CompileCommandListNV,list)
@@ -2253,7 +2253,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, ClearDepthdNV, GLdouble depth) DECLARE_GL_FU
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DepthBoundsdNV, GLdouble zmin, GLdouble zmax) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DepthBoundsdNV,zmin,zmax)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawTextureNV, GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawTextureNV,texture,sampler,x0,y0,x1,y1,z,s0,t0,s1,t1)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawVkImageNV, GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawVkImageNV,vkImage,sampler,x0,y0,x1,y1,z,s0,t0,s1,t1)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLVULKANPROCNV, GetVkProcAddrNV,const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLVULKANPROCNV, GetVkProcAddrNV,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLVULKANPROCNV, GetVkProcAddrNV,const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLVULKANPROCNV, GetVkProcAddrNV,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, WaitVkSemaphoreNV, GLuint64 vkSemaphore) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, WaitVkSemaphoreNV,vkSemaphore)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SignalVkSemaphoreNV, GLuint64 vkSemaphore) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SignalVkSemaphoreNV,vkSemaphore)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SignalVkFenceNV, GLuint64 vkFence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SignalVkFenceNV,vkFence)
@@ -2271,8 +2271,8 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, SampleMaskIndexedNV, GLuint index, GLbitfiel
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexRenderbufferNV, GLenum target, GLuint renderbuffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexRenderbufferNV,target,renderbuffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteFencesNV, GLsizei n, const GLuint* fences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteFencesNV,n,fences)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenFencesNV, GLsizei n, GLuint* fences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenFencesNV,n,fences)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsFenceNV, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsFenceNV,fence)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestFenceNV, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, TestFenceNV,fence)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsFenceNV, GLuint fence) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsFenceNV,fence)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, TestFenceNV, GLuint fence) DECLARE_GL_FUNCTION_STUB_END(GLboolean, TestFenceNV,fence)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetFenceivNV, GLuint fence, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetFenceivNV,fence,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FinishFenceNV, GLuint fence) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FinishFenceNV,fence)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, SetFenceNV, GLuint fence, GLenum condition) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, SetFenceNV,fence,condition)
@@ -2382,7 +2382,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawMeshTasksIndirectNV, GLintptr indir
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MultiDrawMeshTasksIndirectCountNV, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MultiDrawMeshTasksIndirectCountNV,indirect,drawcount,maxdrawcount,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenOcclusionQueriesNV, GLsizei n, GLuint* ids) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenOcclusionQueriesNV,n,ids)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteOcclusionQueriesNV, GLsizei n, const GLuint* ids) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteOcclusionQueriesNV,n,ids)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsOcclusionQueryNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsOcclusionQueryNV,id)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsOcclusionQueryNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsOcclusionQueryNV,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BeginOcclusionQueryNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BeginOcclusionQueryNV,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, EndOcclusionQueryNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, EndOcclusionQueryNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetOcclusionQueryivNV, GLuint id, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetOcclusionQueryivNV,id,pname,params)
@@ -2390,9 +2390,9 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetOcclusionQueryuivNV, GLuint id, GLenum pn
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramBufferParametersfvNV, GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramBufferParametersfvNV,target,bindingIndex,wordIndex,count,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramBufferParametersIivNV, GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramBufferParametersIivNV,target,bindingIndex,wordIndex,count,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramBufferParametersIuivNV, GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramBufferParametersIuivNV,target,bindingIndex,wordIndex,count,params)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenPathsNV, GLsizei range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GenPathsNV,range)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenPathsNV, GLsizei range) DECLARE_GL_FUNCTION_STUB_END(GLuint, GenPathsNV,range)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeletePathsNV, GLuint path, GLsizei range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeletePathsNV,path,range)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPathNV, GLuint path) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsPathNV,path)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPathNV, GLuint path) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsPathNV,path)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PathCommandsNV, GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void* coords) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PathCommandsNV,path,numCommands,commands,numCoords,coordType,coords)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PathCoordsNV, GLuint path, GLsizei numCoords, GLenum coordType, const void* coords) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PathCoordsNV,path,numCoords,coordType,coords)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PathSubCommandsNV, GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void* coords) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PathSubCommandsNV,path,commandStart,commandsToDelete,numCommands,commands,numCoords,coordType,coords)
@@ -2428,10 +2428,10 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPathDashArrayNV, GLuint path, GLfloat* da
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPathMetricsNV, GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLsizei stride, GLfloat* metrics) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPathMetricsNV,metricQueryMask,numPaths,pathNameType,paths,pathBase,stride,metrics)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPathMetricRangeNV, GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat* metrics) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPathMetricRangeNV,metricQueryMask,firstPathName,numPaths,stride,metrics)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetPathSpacingNV, GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat* returnedSpacing) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetPathSpacingNV,pathListMode,numPaths,pathNameType,paths,pathBase,advanceScale,kerningScale,transformType,returnedSpacing)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPointInFillPathNV, GLuint path, GLuint mask, GLfloat x, GLfloat y) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsPointInFillPathNV,path,mask,x,y)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPointInStrokePathNV, GLuint path, GLfloat x, GLfloat y) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsPointInStrokePathNV,path,x,y)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLfloat, GetPathLengthNV, GLuint path, GLsizei startSegment, GLsizei numSegments) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLfloat, GetPathLengthNV,path,startSegment,numSegments)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, PointAlongPathNV, GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat* y, GLfloat* tangentX, GLfloat* tangentY) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, PointAlongPathNV,path,startSegment,numSegments,distance,x,y,tangentX,tangentY)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPointInFillPathNV, GLuint path, GLuint mask, GLfloat x, GLfloat y) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsPointInFillPathNV,path,mask,x,y)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsPointInStrokePathNV, GLuint path, GLfloat x, GLfloat y) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsPointInStrokePathNV,path,x,y)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLfloat, GetPathLengthNV, GLuint path, GLsizei startSegment, GLsizei numSegments) DECLARE_GL_FUNCTION_STUB_END(GLfloat, GetPathLengthNV,path,startSegment,numSegments)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, PointAlongPathNV, GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat* y, GLfloat* tangentX, GLfloat* tangentY) DECLARE_GL_FUNCTION_STUB_END(GLboolean, PointAlongPathNV,path,startSegment,numSegments,distance,x,y,tangentX,tangentY)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MatrixLoad3x2fNV, GLenum matrixMode, const GLfloat* m) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MatrixLoad3x2fNV,matrixMode,m)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MatrixLoad3x3fNV, GLenum matrixMode, const GLfloat* m) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MatrixLoad3x3fNV,matrixMode,m)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MatrixLoadTranspose3x3fNV, GLenum matrixMode, const GLfloat* m) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MatrixLoadTranspose3x3fNV,matrixMode,m)
@@ -2442,9 +2442,9 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilThenCoverFillPathNV, GLuint path, GLe
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilThenCoverStrokePathNV, GLuint path, GLint reference, GLuint mask, GLenum coverMode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilThenCoverStrokePathNV,path,reference,mask,coverMode)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilThenCoverFillPathInstancedNV, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat* transformValues) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilThenCoverFillPathInstancedNV,numPaths,pathNameType,paths,pathBase,fillMode,mask,coverMode,transformType,transformValues)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StencilThenCoverStrokePathInstancedNV, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat* transformValues) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StencilThenCoverStrokePathInstancedNV,numPaths,pathNameType,paths,pathBase,reference,mask,coverMode,transformType,transformValues)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathGlyphIndexRangeNV, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint* baseAndCount) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, PathGlyphIndexRangeNV,fontTarget,fontName,fontStyle,pathParameterTemplate,emScale,baseAndCount)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathGlyphIndexArrayNV, GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, PathGlyphIndexArrayNV,firstPathName,fontTarget,fontName,fontStyle,firstGlyphIndex,numGlyphs,pathParameterTemplate,emScale)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathMemoryGlyphIndexArrayNV, GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void* fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, PathMemoryGlyphIndexArrayNV,firstPathName,fontTarget,fontSize,fontData,faceIndex,firstGlyphIndex,numGlyphs,pathParameterTemplate,emScale)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathGlyphIndexRangeNV, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint* baseAndCount) DECLARE_GL_FUNCTION_STUB_END(GLenum, PathGlyphIndexRangeNV,fontTarget,fontName,fontStyle,pathParameterTemplate,emScale,baseAndCount)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathGlyphIndexArrayNV, GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale) DECLARE_GL_FUNCTION_STUB_END(GLenum, PathGlyphIndexArrayNV,firstPathName,fontTarget,fontName,fontStyle,firstGlyphIndex,numGlyphs,pathParameterTemplate,emScale)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, PathMemoryGlyphIndexArrayNV, GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void* fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale) DECLARE_GL_FUNCTION_STUB_END(GLenum, PathMemoryGlyphIndexArrayNV,firstPathName,fontTarget,fontSize,fontData,faceIndex,firstGlyphIndex,numGlyphs,pathParameterTemplate,emScale)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramPathFragmentInputGenNV, GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat* coeffs) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramPathFragmentInputGenNV,program,location,genMode,components,coeffs)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetProgramResourcefvNV, GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei count, GLsizei* length, GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetProgramResourcefvNV,program,programInterface,index,propCount,props,count,length,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PathColorGenNV, GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PathColorGenNV,color,genMode,colorFormat,coeffs)
@@ -2466,7 +2466,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoi64vNV, GLuint video_slot, GLenum pn
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoui64vNV, GLuint video_slot, GLenum pname, GLuint64EXT* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVideoui64vNV,video_slot,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PrimitiveRestartNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PrimitiveRestartNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PrimitiveRestartIndexNV, GLuint index) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PrimitiveRestartIndexNV,index)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, QueryResourceNV, GLenum queryType, GLint tagId, GLuint count, GLint* buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, QueryResourceNV,queryType,tagId,count,buffer)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, QueryResourceNV, GLenum queryType, GLint tagId, GLuint count, GLint* buffer) DECLARE_GL_FUNCTION_STUB_END(GLint, QueryResourceNV,queryType,tagId,count,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenQueryResourceTagNV, GLsizei n, GLint* tagIds) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenQueryResourceTagNV,n,tagIds)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteQueryResourceTagNV, GLsizei n, const GLint* tagIds) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteQueryResourceTagNV,n,tagIds)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, QueryResourceTagNV, GLint tagId, const GLchar* tagString) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, QueryResourceTagNV,tagId,tagString)
@@ -2492,10 +2492,10 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, ScissorExclusiveNV, GLint x, GLint y, GLsize
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ScissorExclusiveArrayvNV, GLuint first, GLsizei count, const GLint* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ScissorExclusiveArrayvNV,first,count,v)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeBufferResidentNV, GLenum target, GLenum access) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeBufferResidentNV,target,access)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeBufferNonResidentNV, GLenum target) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeBufferNonResidentNV,target)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsBufferResidentNV, GLenum target) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsBufferResidentNV,target)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsBufferResidentNV, GLenum target) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsBufferResidentNV,target)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeNamedBufferResidentNV, GLuint buffer, GLenum access) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeNamedBufferResidentNV,buffer,access)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, MakeNamedBufferNonResidentNV, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, MakeNamedBufferNonResidentNV,buffer)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNamedBufferResidentNV, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsNamedBufferResidentNV,buffer)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsNamedBufferResidentNV, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsNamedBufferResidentNV,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetBufferParameterui64vNV, GLenum target, GLenum pname, GLuint64EXT* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetBufferParameterui64vNV,target,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetNamedBufferParameterui64vNV, GLuint buffer, GLenum pname, GLuint64EXT* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetNamedBufferParameterui64vNV,buffer,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetIntegerui64vNV, GLenum value, GLuint64EXT* result) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetIntegerui64vNV,value,result)
@@ -2528,28 +2528,28 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, BindBufferOffsetNV, GLenum target, GLuint in
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindBufferBaseNV, GLenum target, GLuint index, GLuint buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindBufferBaseNV,target,index,buffer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TransformFeedbackVaryingsNV, GLuint program, GLsizei count, const GLint* locations, GLenum bufferMode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TransformFeedbackVaryingsNV,program,count,locations,bufferMode)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ActiveVaryingNV, GLuint program, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ActiveVaryingNV,program,name)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetVaryingLocationNV, GLuint program, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetVaryingLocationNV,program,name)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetVaryingLocationNV, GLuint program, const GLchar* name) DECLARE_GL_FUNCTION_STUB_END(GLint, GetVaryingLocationNV,program,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetActiveVaryingNV, GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetActiveVaryingNV,program,index,bufSize,length,size,type,name)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetTransformFeedbackVaryingNV, GLuint program, GLuint index, GLint* location) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetTransformFeedbackVaryingNV,program,index,location)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TransformFeedbackStreamAttribsNV, GLsizei count, const GLint* attribs, GLsizei nbuffers, const GLint* bufstreams, GLenum bufferMode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TransformFeedbackStreamAttribsNV,count,attribs,nbuffers,bufstreams,bufferMode)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindTransformFeedbackNV, GLenum target, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindTransformFeedbackNV,target,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteTransformFeedbacksNV, GLsizei n, const GLuint* ids) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteTransformFeedbacksNV,n,ids)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GenTransformFeedbacksNV, GLsizei n, GLuint* ids) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GenTransformFeedbacksNV,n,ids)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTransformFeedbackNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsTransformFeedbackNV,id)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsTransformFeedbackNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsTransformFeedbackNV,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, PauseTransformFeedbackNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, PauseTransformFeedbackNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ResumeTransformFeedbackNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ResumeTransformFeedbackNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DrawTransformFeedbackNV, GLenum mode, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DrawTransformFeedbackNV,mode,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUInitNV,const void* vdpDevice, const void* getProcAddress) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUInitNV,vdpDevice,getProcAddress)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUFiniNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUFiniNV,)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceNV,vdpSurface,target,numTextureNames,textureNames)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterOutputSurfaceNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLvdpauSurfaceNV, VDPAURegisterOutputSurfaceNV,vdpSurface,target,numTextureNames,textureNames)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, VDPAUIsSurfaceNV, GLvdpauSurfaceNV surface) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, VDPAUIsSurfaceNV,surface)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames) DECLARE_GL_FUNCTION_STUB_END(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceNV,vdpSurface,target,numTextureNames,textureNames)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterOutputSurfaceNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames) DECLARE_GL_FUNCTION_STUB_END(GLvdpauSurfaceNV, VDPAURegisterOutputSurfaceNV,vdpSurface,target,numTextureNames,textureNames)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, VDPAUIsSurfaceNV, GLvdpauSurfaceNV surface) DECLARE_GL_FUNCTION_STUB_END(GLboolean, VDPAUIsSurfaceNV,surface)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUUnregisterSurfaceNV, GLvdpauSurfaceNV surface) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUUnregisterSurfaceNV,surface)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUGetSurfaceivNV, GLvdpauSurfaceNV surface, GLenum pname, GLsizei count, GLsizei* length, GLint* values) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUGetSurfaceivNV,surface,pname,count,length,values)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUSurfaceAccessNV, GLvdpauSurfaceNV surface, GLenum access) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUSurfaceAccessNV,surface,access)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUMapSurfacesNV, GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUMapSurfacesNV,numSurfaces,surfaces)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VDPAUUnmapSurfacesNV, GLsizei numSurface, const GLvdpauSurfaceNV* surfaces) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VDPAUUnmapSurfacesNV,numSurface,surfaces)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceWithPictureStructureNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames, GLboolean isFrameStructure) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceWithPictureStructureNV,vdpSurface,target,numTextureNames,textureNames,isFrameStructure)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceWithPictureStructureNV,const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint* textureNames, GLboolean isFrameStructure) DECLARE_GL_FUNCTION_STUB_END(GLvdpauSurfaceNV, VDPAURegisterVideoSurfaceWithPictureStructureNV,vdpSurface,target,numTextureNames,textureNames,isFrameStructure)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FlushVertexArrayRangeNV,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FlushVertexArrayRangeNV,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexArrayRangeNV, GLsizei length, const void* pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexArrayRangeNV,length,pointer)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribL1i64NV, GLuint index, GLint64EXT x) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribL1i64NV,index,x)
@@ -2583,7 +2583,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, FogCoordFormatNV, GLenum type, GLsizei strid
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribFormatNV, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribFormatNV,index,size,type,normalized,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VertexAttribIFormatNV, GLuint index, GLint size, GLenum type, GLsizei stride) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VertexAttribIFormatNV,index,size,type,stride)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetIntegerui64i_vNV, GLenum value, GLuint index, GLuint64EXT* result) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetIntegerui64i_vNV,value,index,result)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AreProgramsResidentNV, GLsizei n, const GLuint* programs, GLboolean* residences) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, AreProgramsResidentNV,n,programs,residences)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, AreProgramsResidentNV, GLsizei n, const GLuint* programs, GLboolean* residences) DECLARE_GL_FUNCTION_STUB_END(GLboolean, AreProgramsResidentNV,n,programs,residences)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, BindProgramNV, GLenum target, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, BindProgramNV,target,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteProgramsNV, GLsizei n, const GLuint* programs) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteProgramsNV,n,programs)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ExecuteProgramNV, GLenum target, GLuint id, const GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ExecuteProgramNV,target,id,params)
@@ -2597,7 +2597,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribdvNV, GLuint index, GLenum pn
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribfvNV, GLuint index, GLenum pname, GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVertexAttribfvNV,index,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribivNV, GLuint index, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVertexAttribivNV,index,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVertexAttribPointervNV, GLuint index, GLenum pname, void* *pointer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVertexAttribPointervNV,index,pname,*pointer)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsProgramNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsProgramNV,id)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsProgramNV, GLuint id) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsProgramNV,id)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LoadProgramNV, GLenum target, GLuint id, GLsizei len, const GLubyte* program) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LoadProgramNV,target,id,len,program)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramParameter4dNV, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramParameter4dNV,target,index,x,y,z,w)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ProgramParameter4dvNV, GLenum target, GLuint index, const GLdouble* v) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ProgramParameter4dvNV,target,index,v)
@@ -2655,7 +2655,7 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoCaptureivNV, GLuint video_capture_sl
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoCaptureStreamivNV, GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVideoCaptureStreamivNV,video_capture_slot,stream,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoCaptureStreamfvNV, GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVideoCaptureStreamfvNV,video_capture_slot,stream,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetVideoCaptureStreamdvNV, GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetVideoCaptureStreamdvNV,video_capture_slot,stream,pname,params)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, VideoCaptureNV, GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT* capture_time) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLenum, VideoCaptureNV,video_capture_slot,sequence_num,capture_time)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLenum, VideoCaptureNV, GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT* capture_time) DECLARE_GL_FUNCTION_STUB_END(GLenum, VideoCaptureNV,video_capture_slot,sequence_num,capture_time)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VideoCaptureStreamParameterivNV, GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VideoCaptureStreamParameterivNV,video_capture_slot,stream,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VideoCaptureStreamParameterfvNV, GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VideoCaptureStreamParameterfvNV,video_capture_slot,stream,pname,params)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, VideoCaptureStreamParameterdvNV, GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, VideoCaptureStreamParameterdvNV,video_capture_slot,stream,pname,params)
@@ -2684,11 +2684,11 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, TextureColorMaskSGIS, GLboolean red, GLboole
 DECLARE_GL_FUNCTION_STUB_HEAD(void, GetTexFilterFuncSGIS, GLenum target, GLenum filter, GLfloat* weights) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, GetTexFilterFuncSGIS,target,filter,weights)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, TexFilterFuncSGIS, GLenum target, GLenum filter, GLsizei n, const GLfloat* weights) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, TexFilterFuncSGIS,target,filter,n,weights)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, AsyncMarkerSGIX, GLuint marker) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, AsyncMarkerSGIX,marker)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, FinishAsyncSGIX, GLuint* markerp) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, FinishAsyncSGIX,markerp)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, PollAsyncSGIX, GLuint* markerp) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, PollAsyncSGIX,markerp)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenAsyncMarkersSGIX, GLsizei range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLuint, GenAsyncMarkersSGIX,range)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, FinishAsyncSGIX, GLuint* markerp) DECLARE_GL_FUNCTION_STUB_END(GLint, FinishAsyncSGIX,markerp)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, PollAsyncSGIX, GLuint* markerp) DECLARE_GL_FUNCTION_STUB_END(GLint, PollAsyncSGIX,markerp)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLuint, GenAsyncMarkersSGIX, GLsizei range) DECLARE_GL_FUNCTION_STUB_END(GLuint, GenAsyncMarkersSGIX,range)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, DeleteAsyncMarkersSGIX, GLuint marker, GLsizei range) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, DeleteAsyncMarkersSGIX,marker,range)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsAsyncMarkerSGIX, GLuint marker) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLboolean, IsAsyncMarkerSGIX,marker)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLboolean, IsAsyncMarkerSGIX, GLuint marker) DECLARE_GL_FUNCTION_STUB_END(GLboolean, IsAsyncMarkerSGIX,marker)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FlushRasterSGIX,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FlushRasterSGIX,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FragmentColorMaterialSGIX, GLenum face, GLenum mode) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FragmentColorMaterialSGIX,face,mode)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FragmentLightfSGIX, GLenum light, GLenum pname, GLfloat param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FragmentLightfSGIX,light,pname,param)
@@ -2710,9 +2710,9 @@ DECLARE_GL_FUNCTION_STUB_HEAD(void, GetFragmentMaterialivSGIX, GLenum face, GLen
 DECLARE_GL_FUNCTION_STUB_HEAD(void, LightEnviSGIX, GLenum pname, GLint param) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, LightEnviSGIX,pname,param)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, FrameZoomSGIX, GLint factor) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, FrameZoomSGIX,factor)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, IooInterfaceSGIX, GLenum pname, const void* params) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, IooInterfaceSGIX,pname,params)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetInstrumentsSGIX,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, GetInstrumentsSGIX,)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, GetInstrumentsSGIX,void) DECLARE_GL_FUNCTION_STUB_END(GLint, GetInstrumentsSGIX,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, InstrumentsBufferSGIX, GLsizei size, GLint* buffer) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, InstrumentsBufferSGIX,size,buffer)
-DECLARE_GL_FUNCTION_STUB_HEAD(GLint, PollInstrumentsSGIX, GLint* marker_p) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(GLint, PollInstrumentsSGIX,marker_p)
+DECLARE_GL_FUNCTION_STUB_HEAD(GLint, PollInstrumentsSGIX, GLint* marker_p) DECLARE_GL_FUNCTION_STUB_END(GLint, PollInstrumentsSGIX,marker_p)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, ReadInstrumentsSGIX, GLint marker) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, ReadInstrumentsSGIX,marker)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StartInstrumentsSGIX,void) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StartInstrumentsSGIX,)
 DECLARE_GL_FUNCTION_STUB_HEAD(void, StopInstrumentsSGIX, GLint marker) DECLARE_GL_FUNCTION_STUB_END_NO_RETURN(void, StopInstrumentsSGIX,marker)

MG/MG_GL/Implementations/GL/Getter/GL_Getter.cpp

@@ -120,6 +120,32 @@ namespace MG_GL::GL {
         }
 
         switch (pname) {
+            // General
+            case GL_CONTEXT_PROFILE_MASK:
+                params[0] = GL_CONTEXT_CORE_PROFILE_BIT;
+                break;
+            case GL_NUM_EXTENSIONS:
+                static GLint num_extensions = -1;
+                if (num_extensions == -1) {
+                    const GLubyte* ext_str = MG_GL::GL::GetString(GL_EXTENSIONS);
+                    char *copy = strdup((const char *) ext_str);
+                    char *token = strtok(copy, " ");
+                    num_extensions = 0;
+                    while (token) {
+                        num_extensions++;
+                        token = strtok(nullptr, " ");
+                    }
+                    free(copy);
+                }
+                params[0] = num_extensions;
+                break;
+            case GL_MAJOR_VERSION:
+                params[0] = MG_Global::GL::GLVersionMajor;
+                break;
+            case GL_MINOR_VERSION:
+                params[0] = MG_Global::GL::GLVersionMinor;
+                break;
+            
             // Viewport and scissor
             case GL_VIEWPORT:
                 memcpy(params, MG_State_T::commonState->viewport, 4 * sizeof(GLint));

MG/MG_GL/State/Buffer/BufferState.cpp

@@ -196,7 +196,15 @@ GLenum BufferState::CopyBufferRange(GLenum readTarget, GLenum writeTarget, GLint
 }
 
 GLenum BufferState::AcquireBufferMemory(GLenum target, GLenum access, void** mappedPointer) {
-    return AcquireBufferMemoryRange(target, 0, buffers_[currentBindings_[target]].data.size(), access, mappedPointer);
+    GLbitfield flags = 0;
+    switch (access) {
+        case GL_READ_ONLY:  flags = GL_MAP_READ_BIT; break;
+        case GL_WRITE_ONLY: flags = GL_MAP_WRITE_BIT; break;
+        case GL_READ_WRITE: flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; break;
+        default:
+            flags = access;
+    }
+    return AcquireBufferMemoryRange(target, 0, buffers_[currentBindings_[target]].data.size(), flags, mappedPointer);
 }
 
 GLenum BufferState::ReleaseBufferMemory(GLenum target) {

MG/MG_GL/State/Framebuffer/FramebufferState.h

@@ -17,7 +17,7 @@ struct FramebufferAttachment {
 
 struct FramebufferObject {
     bool generated = false;
-    std::unordered_map<GLenum, FramebufferAttachment> attachments;
+    ankerl::unordered_map<GLenum, FramebufferAttachment> attachments;
     GLenum status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT;
     GLsizei width = 0;
     GLsizei height = 0;
@@ -35,10 +35,10 @@ public:
     GLenum ValidateCompleteness(GLenum target);
     FramebufferObject* GetCurrentFBO(GLenum target);
     
-    std::unordered_map<GLenum, GLuint> currentBindings_; // READ/DRAW/FRAMEBUFFER
+    ankerl::unordered_map<GLenum, GLuint> currentBindings_; // READ/DRAW
     
 private:
-    std::unordered_map<GLuint, FramebufferObject> framebuffers_;
+    ankerl::unordered_map<GLuint, FramebufferObject> framebuffers_;
     std::set<GLuint> freeIds_;
     GLuint lastId_ = 0;
     bool ValidateHandle(GLuint framebuffer);

MG/MG_GL/State/Program/ProgramState.h

@@ -41,17 +41,17 @@ struct ProgramObject {
     bool dirty;
     GLint linkStatus;
     std::string infoLog;
-    std::unordered_map<std::string, GLint> attribBindings;
-    std::unordered_map<std::string, GLint> attribLocations;
-    std::unordered_map<std::string, GLint> uniformLocations;
-    std::unordered_map<std::string, UniformValue> uniformValues;
+    ankerl::unordered_map<std::string, GLint> attribBindings;
+    ankerl::unordered_map<std::string, GLint> attribLocations;
+    ankerl::unordered_map<std::string, GLint> uniformLocations;
+    ankerl::unordered_map<std::string, UniformValue> uniformValues;
     bool markedForDeletion;
 };
 
 class ProgramState {
 public:
-    std::unordered_map<GLuint, ShaderObject> shaders_;
-    std::unordered_map<GLuint, ProgramObject> programs_;
+    ankerl::unordered_map<GLuint, ShaderObject> shaders_;
+    ankerl::unordered_map<GLuint, ProgramObject> programs_;
     std::set<GLuint> freeShaderIds_;
     std::set<GLuint> freeProgramIds_;
     GLuint lastShaderId_ = 0;

MG/MG_GL/State/Texture/TextureState.h

@@ -64,7 +64,7 @@ class TextureState {
 private:
 
     GLuint lastUsedID_ = 1;
-//    std::unordered_set<GLuint> freeIDs_;
+//    ankerl::unordered_set<GLuint> freeIDs_;
     std::vector<GLuint> freeID_;
 
     unordered_map<GLenum, TextureObject> proxyTextures_;

MG/MG_GL/State/VertexArray/VertexArrayState.h

@@ -24,7 +24,7 @@ struct VertexArrayObject {
     bool attribDirty = false;
     bool eboDirty = false;
     GLuint elementBuffer = 0;
-    std::unordered_map<GLuint, VertexAttribState> attribs;
+    ankerl::unordered_map<GLuint, VertexAttribState> attribs;
 };
 
 class VertexArrayState {
@@ -50,7 +50,7 @@ public:
     bool ValidateAllocatedHandle(GLuint array);
 
     GLuint currentVao_ = 0;
-    std::unordered_map<GLuint, VertexArrayObject> vaos_;
+    ankerl::unordered_map<GLuint, VertexArrayObject> vaos_;
 private:
     std::set<GLuint> freeIds_;
     GLuint lastId_ = 0;

MG/MG_RHI/GLES/Test/TestDrawing.cpp

@@ -48,8 +48,8 @@ namespace MG_RHI::GLES::Test {
             GLuint quadVBO = 0;
             GLint uTexLoc = -1;
             GLint uMVPLoc = -1;
-            std::unordered_map<GLuint, GLuint> textureCache;
-            std::unordered_map<GLuint, bool> textureDirty;
+            ankerl::unordered_map<GLuint, GLuint> textureCache;
+            ankerl::unordered_map<GLuint, bool> textureDirty;
         };
 
         static ScreenResources sRes;

MG/MG_UTIL/Program/GLSLTool.cpp

@@ -108,7 +108,7 @@ namespace MG_Util::Program {
             return;
         }
 
-        std::unordered_set<GLint> used_locations;
+        ankerl::unordered_set<GLint> used_locations;
         GLint auto_location = 0;
         for (auto spirv: allSpirv) {
             spvc_parsed_ir ir = nullptr;