From aca55c4984ccac2911e03f710afd1355bf588fb8 Mon Sep 17 00:00:00 2001 From: Willy Scheibel Date: Tue, 27 Feb 2024 10:52:07 +0100 Subject: [PATCH] Update gl.xml --- .../include/glbinding-aux/Meta.h | 12 --- .../include/glbinding-aux/types_to_string.h | 1 - .../Meta_ExtensionsByFunctionString.cpp | 2 + .../source/Meta_ExtensionsByString.cpp | 2 + .../Meta_FunctionStringsByExtension.cpp | 1 + source/glbinding-aux/source/Meta_Maps.h | 1 - .../source/Meta_StringsByBitfield.cpp | 30 ------- .../source/Meta_StringsByExtension.cpp | 2 + .../source/Meta_getStringByBitfield.cpp | 10 --- source/glbinding-aux/source/glrevision.h | 2 +- .../glbinding-aux/source/types_to_string.cpp | 18 ---- source/glbinding/include/glbinding/Binding.h | 5 +- .../glbinding/include/glbinding/gl/bitfield.h | 83 ++++++------------- source/glbinding/include/glbinding/gl/enum.h | 74 ++++++++++++----- .../include/glbinding/gl/extension.h | 2 + .../include/glbinding/gl/functions.h | 2 + source/glbinding/include/glbinding/gl/types.h | 1 - .../glbinding/include/glbinding/gl/types.inl | 61 -------------- .../glbinding/include/glbinding/gl10/types.h | 1 - .../include/glbinding/gl10ext/functions.h | 2 + .../include/glbinding/gl10ext/types.h | 1 - .../glbinding/include/glbinding/gl11/types.h | 1 - .../include/glbinding/gl11ext/functions.h | 2 + .../include/glbinding/gl11ext/types.h | 1 - .../glbinding/include/glbinding/gl12/types.h | 1 - .../include/glbinding/gl12ext/functions.h | 2 + .../include/glbinding/gl12ext/types.h | 1 - .../glbinding/include/glbinding/gl13/types.h | 1 - .../include/glbinding/gl13ext/functions.h | 2 + .../include/glbinding/gl13ext/types.h | 1 - .../glbinding/include/glbinding/gl14/types.h | 1 - .../include/glbinding/gl14ext/functions.h | 2 + .../include/glbinding/gl14ext/types.h | 1 - .../glbinding/include/glbinding/gl15/types.h | 1 - .../include/glbinding/gl15ext/functions.h | 2 + .../include/glbinding/gl15ext/types.h | 1 - .../glbinding/include/glbinding/gl20/types.h | 1 - .../include/glbinding/gl20ext/functions.h | 2 + .../include/glbinding/gl20ext/types.h | 1 - .../glbinding/include/glbinding/gl21/types.h | 1 - .../include/glbinding/gl21ext/functions.h | 2 + .../include/glbinding/gl21ext/types.h | 1 - .../glbinding/include/glbinding/gl30/types.h | 1 - .../include/glbinding/gl30ext/functions.h | 2 + .../include/glbinding/gl30ext/types.h | 1 - .../glbinding/include/glbinding/gl31/types.h | 1 - .../include/glbinding/gl31ext/functions.h | 2 + .../include/glbinding/gl31ext/types.h | 1 - .../glbinding/include/glbinding/gl32/types.h | 1 - .../include/glbinding/gl32core/types.h | 1 - .../include/glbinding/gl32ext/functions.h | 2 + .../include/glbinding/gl32ext/types.h | 1 - .../glbinding/include/glbinding/gl33/types.h | 1 - .../include/glbinding/gl33core/types.h | 1 - .../include/glbinding/gl33ext/functions.h | 2 + .../include/glbinding/gl33ext/types.h | 1 - .../glbinding/include/glbinding/gl40/types.h | 1 - .../include/glbinding/gl40core/types.h | 1 - .../include/glbinding/gl40ext/functions.h | 2 + .../include/glbinding/gl40ext/types.h | 1 - .../glbinding/include/glbinding/gl41/types.h | 1 - .../include/glbinding/gl41core/types.h | 1 - .../include/glbinding/gl41ext/functions.h | 2 + .../include/glbinding/gl41ext/types.h | 1 - .../glbinding/include/glbinding/gl42/types.h | 1 - .../include/glbinding/gl42core/types.h | 1 - .../include/glbinding/gl42ext/functions.h | 2 + .../include/glbinding/gl42ext/types.h | 1 - .../glbinding/include/glbinding/gl43/types.h | 1 - .../include/glbinding/gl43core/types.h | 1 - .../include/glbinding/gl43ext/functions.h | 2 + .../include/glbinding/gl43ext/types.h | 1 - .../glbinding/include/glbinding/gl44/types.h | 1 - .../include/glbinding/gl44core/types.h | 1 - .../include/glbinding/gl44ext/functions.h | 2 + .../include/glbinding/gl44ext/types.h | 1 - .../glbinding/include/glbinding/gl45/types.h | 1 - .../include/glbinding/gl45core/types.h | 1 - .../include/glbinding/gl45ext/functions.h | 2 + .../include/glbinding/gl45ext/types.h | 1 - .../glbinding/include/glbinding/gl46/types.h | 1 - .../include/glbinding/gl46core/types.h | 1 - .../include/glbinding/gl46ext/functions.h | 2 + .../include/glbinding/gl46ext/types.h | 1 - .../glbinding/include/glbinding/glbinding.h | 1 - source/glbinding/source/Binding_list.cpp | 2 + source/glbinding/source/Binding_objects_b.cpp | 2 + source/glbinding/source/gl/functions_b.cpp | 10 +++ 88 files changed, 145 insertions(+), 264 deletions(-) diff --git a/source/glbinding-aux/include/glbinding-aux/Meta.h b/source/glbinding-aux/include/glbinding-aux/Meta.h index 853b82958..9747cee01 100644 --- a/source/glbinding-aux/include/glbinding-aux/Meta.h +++ b/source/glbinding-aux/include/glbinding-aux/Meta.h @@ -432,18 +432,6 @@ class GLBINDING_AUX_API Meta */ static const std::string & getString(gl::PathMetricMask glbitfield); - /** - * @brief - * Convert bitfield to symbol name string representation - * - * @param[in] bitfield - * The bitfield value - * - * @return - * The string representation of the value - */ - static const std::string & getString(gl::PathRenderingMaskNV glbitfield); - /** * @brief * Convert bitfield to symbol name string representation diff --git a/source/glbinding-aux/include/glbinding-aux/types_to_string.h b/source/glbinding-aux/include/glbinding-aux/types_to_string.h index 8e6f19566..a5f3902cf 100644 --- a/source/glbinding-aux/include/glbinding-aux/types_to_string.h +++ b/source/glbinding-aux/include/glbinding-aux/types_to_string.h @@ -34,7 +34,6 @@ GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const MemoryB GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const OcclusionQueryEventMaskAMD & value); GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathFontStyle & value); GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathMetricMask & value); -GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathRenderingMaskNV & value); GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PerformanceQueryCapsMaskINTEL & value); GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const SyncObjectMask & value); GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const TextureStorageMaskAMD & value); diff --git a/source/glbinding-aux/source/Meta_ExtensionsByFunctionString.cpp b/source/glbinding-aux/source/Meta_ExtensionsByFunctionString.cpp index 26f06703e..657715f37 100644 --- a/source/glbinding-aux/source/Meta_ExtensionsByFunctionString.cpp +++ b/source/glbinding-aux/source/Meta_ExtensionsByFunctionString.cpp @@ -132,6 +132,8 @@ const std::unordered_map> Meta_ExtensionsByFu { "glBlendParameteriNV", { GLextension::GL_NV_blend_equation_advanced } }, { "glBlitFramebuffer", { GLextension::GL_ARB_framebuffer_object } }, { "glBlitFramebufferEXT", { GLextension::GL_EXT_framebuffer_blit } }, + { "glBlitFramebufferLayerEXT", { GLextension::GL_EXT_framebuffer_blit_layers } }, + { "glBlitFramebufferLayersEXT", { GLextension::GL_EXT_framebuffer_blit_layers } }, { "glBlitNamedFramebuffer", { GLextension::GL_ARB_direct_state_access } }, { "glBufferAddressRangeNV", { GLextension::GL_NV_vertex_buffer_unified_memory } }, { "glBufferAttachMemoryNV", { GLextension::GL_NV_memory_attachment } }, diff --git a/source/glbinding-aux/source/Meta_ExtensionsByString.cpp b/source/glbinding-aux/source/Meta_ExtensionsByString.cpp index 4024f8d3f..4f18c56c3 100644 --- a/source/glbinding-aux/source/Meta_ExtensionsByString.cpp +++ b/source/glbinding-aux/source/Meta_ExtensionsByString.cpp @@ -299,6 +299,7 @@ const std::unordered_map Meta_ExtensionsByString_E = { "GL_EXT_external_buffer", GLextension::GL_EXT_external_buffer }, { "GL_EXT_fog_coord", GLextension::GL_EXT_fog_coord }, { "GL_EXT_framebuffer_blit", GLextension::GL_EXT_framebuffer_blit }, + { "GL_EXT_framebuffer_blit_layers", GLextension::GL_EXT_framebuffer_blit_layers }, { "GL_EXT_framebuffer_multisample", GLextension::GL_EXT_framebuffer_multisample }, { "GL_EXT_framebuffer_multisample_blit_scaled", GLextension::GL_EXT_framebuffer_multisample_blit_scaled }, { "GL_EXT_framebuffer_object", GLextension::GL_EXT_framebuffer_object }, @@ -572,6 +573,7 @@ const std::unordered_map Meta_ExtensionsByString_N = { "GL_NV_timeline_semaphore", GLextension::GL_NV_timeline_semaphore }, { "GL_NV_transform_feedback", GLextension::GL_NV_transform_feedback }, { "GL_NV_transform_feedback2", GLextension::GL_NV_transform_feedback2 }, + { "GL_NV_uniform_buffer_std430_layout", GLextension::GL_NV_uniform_buffer_std430_layout }, { "GL_NV_uniform_buffer_unified_memory", GLextension::GL_NV_uniform_buffer_unified_memory }, { "GL_NV_vdpau_interop", GLextension::GL_NV_vdpau_interop }, { "GL_NV_vdpau_interop2", GLextension::GL_NV_vdpau_interop2 }, diff --git a/source/glbinding-aux/source/Meta_FunctionStringsByExtension.cpp b/source/glbinding-aux/source/Meta_FunctionStringsByExtension.cpp index 46e325fee..539a6e669 100644 --- a/source/glbinding-aux/source/Meta_FunctionStringsByExtension.cpp +++ b/source/glbinding-aux/source/Meta_FunctionStringsByExtension.cpp @@ -157,6 +157,7 @@ const std::unordered_map> Meta_FunctionString { GLextension::GL_EXT_external_buffer, { "glBufferStorageExternalEXT", "glNamedBufferStorageExternalEXT" } }, { GLextension::GL_EXT_fog_coord, { "glFogCoorddEXT", "glFogCoorddvEXT", "glFogCoordfEXT", "glFogCoordfvEXT", "glFogCoordPointerEXT" } }, { GLextension::GL_EXT_framebuffer_blit, { "glBlitFramebufferEXT" } }, + { GLextension::GL_EXT_framebuffer_blit_layers, { "glBlitFramebufferLayerEXT", "glBlitFramebufferLayersEXT" } }, { GLextension::GL_EXT_framebuffer_multisample, { "glRenderbufferStorageMultisampleEXT" } }, { GLextension::GL_EXT_framebuffer_object, { "glBindFramebufferEXT", "glBindRenderbufferEXT", "glCheckFramebufferStatusEXT", "glDeleteFramebuffersEXT", "glDeleteRenderbuffersEXT", "glFramebufferRenderbufferEXT", "glFramebufferTexture1DEXT", "glFramebufferTexture2DEXT", "glFramebufferTexture3DEXT", "glGenerateMipmapEXT", "glGenFramebuffersEXT", "glGenRenderbuffersEXT", "glGetFramebufferAttachmentParameterivEXT", "glGetRenderbufferParameterivEXT", "glIsFramebufferEXT", "glIsRenderbufferEXT", "glRenderbufferStorageEXT" } }, { GLextension::GL_EXT_geometry_shader4, { "glProgramParameteriEXT" } }, diff --git a/source/glbinding-aux/source/Meta_Maps.h b/source/glbinding-aux/source/Meta_Maps.h index 1bb5ac0c7..f6a094000 100644 --- a/source/glbinding-aux/source/Meta_Maps.h +++ b/source/glbinding-aux/source/Meta_Maps.h @@ -48,7 +48,6 @@ extern const std::unordered_map Meta_Strings extern const std::unordered_map Meta_StringsByOcclusionQueryEventMaskAMD; extern const std::unordered_map Meta_StringsByPathFontStyle; extern const std::unordered_map Meta_StringsByPathMetricMask; -extern const std::unordered_map Meta_StringsByPathRenderingMaskNV; extern const std::unordered_map Meta_StringsByPerformanceQueryCapsMaskINTEL; extern const std::unordered_map Meta_StringsBySyncObjectMask; extern const std::unordered_map Meta_StringsByTextureStorageMaskAMD; diff --git a/source/glbinding-aux/source/Meta_StringsByBitfield.cpp b/source/glbinding-aux/source/Meta_StringsByBitfield.cpp index 05f4f5e42..721ae78d0 100644 --- a/source/glbinding-aux/source/Meta_StringsByBitfield.cpp +++ b/source/glbinding-aux/source/Meta_StringsByBitfield.cpp @@ -220,36 +220,6 @@ const std::unordered_map Meta_StringsByPathMetricMa { PathMetricMask::GL_NONE_BIT, "GL_NONE_BIT" } }; -const std::unordered_map Meta_StringsByPathRenderingMaskNV = -{ - { PathRenderingMaskNV::GL_BOLD_BIT_NV, "GL_BOLD_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_ASCENDER_BIT_NV, "GL_FONT_ASCENDER_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_DESCENDER_BIT_NV, "GL_FONT_DESCENDER_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_HAS_KERNING_BIT_NV, "GL_FONT_HAS_KERNING_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_HEIGHT_BIT_NV, "GL_FONT_HEIGHT_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV, "GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV, "GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_NUM_GLYPH_INDICES_BIT_NV, "GL_FONT_NUM_GLYPH_INDICES_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_UNDERLINE_POSITION_BIT_NV, "GL_FONT_UNDERLINE_POSITION_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_UNDERLINE_THICKNESS_BIT_NV, "GL_FONT_UNDERLINE_THICKNESS_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_UNITS_PER_EM_BIT_NV, "GL_FONT_UNITS_PER_EM_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_X_MAX_BOUNDS_BIT_NV, "GL_FONT_X_MAX_BOUNDS_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_X_MIN_BOUNDS_BIT_NV, "GL_FONT_X_MIN_BOUNDS_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_Y_MAX_BOUNDS_BIT_NV, "GL_FONT_Y_MAX_BOUNDS_BIT_NV" }, - { PathRenderingMaskNV::GL_FONT_Y_MIN_BOUNDS_BIT_NV, "GL_FONT_Y_MIN_BOUNDS_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_HAS_KERNING_BIT_NV, "GL_GLYPH_HAS_KERNING_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_HEIGHT_BIT_NV, "GL_GLYPH_HEIGHT_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_X_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_X_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV" }, - { PathRenderingMaskNV::GL_GLYPH_WIDTH_BIT_NV, "GL_GLYPH_WIDTH_BIT_NV" }, - { PathRenderingMaskNV::GL_ITALIC_BIT_NV, "GL_ITALIC_BIT_NV" }, - { PathRenderingMaskNV::GL_NONE_BIT, "GL_NONE_BIT" } -}; - const std::unordered_map Meta_StringsByPerformanceQueryCapsMaskINTEL = { { PerformanceQueryCapsMaskINTEL::GL_NONE_BIT, "GL_NONE_BIT" }, diff --git a/source/glbinding-aux/source/Meta_StringsByExtension.cpp b/source/glbinding-aux/source/Meta_StringsByExtension.cpp index b5cffaef2..9383b7721 100644 --- a/source/glbinding-aux/source/Meta_StringsByExtension.cpp +++ b/source/glbinding-aux/source/Meta_StringsByExtension.cpp @@ -285,6 +285,7 @@ const std::unordered_map Meta_StringsByExtension = { GLextension::GL_EXT_external_buffer, "GL_EXT_external_buffer" }, { GLextension::GL_EXT_fog_coord, "GL_EXT_fog_coord" }, { GLextension::GL_EXT_framebuffer_blit, "GL_EXT_framebuffer_blit" }, + { GLextension::GL_EXT_framebuffer_blit_layers, "GL_EXT_framebuffer_blit_layers" }, { GLextension::GL_EXT_framebuffer_multisample, "GL_EXT_framebuffer_multisample" }, { GLextension::GL_EXT_framebuffer_multisample_blit_scaled, "GL_EXT_framebuffer_multisample_blit_scaled" }, { GLextension::GL_EXT_framebuffer_object, "GL_EXT_framebuffer_object" }, @@ -528,6 +529,7 @@ const std::unordered_map Meta_StringsByExtension = { GLextension::GL_NV_timeline_semaphore, "GL_NV_timeline_semaphore" }, { GLextension::GL_NV_transform_feedback, "GL_NV_transform_feedback" }, { GLextension::GL_NV_transform_feedback2, "GL_NV_transform_feedback2" }, + { GLextension::GL_NV_uniform_buffer_std430_layout, "GL_NV_uniform_buffer_std430_layout" }, { GLextension::GL_NV_uniform_buffer_unified_memory, "GL_NV_uniform_buffer_unified_memory" }, { GLextension::GL_NV_vdpau_interop, "GL_NV_vdpau_interop" }, { GLextension::GL_NV_vdpau_interop2, "GL_NV_vdpau_interop2" }, diff --git a/source/glbinding-aux/source/Meta_getStringByBitfield.cpp b/source/glbinding-aux/source/Meta_getStringByBitfield.cpp index 60aff1c79..634910e14 100644 --- a/source/glbinding-aux/source/Meta_getStringByBitfield.cpp +++ b/source/glbinding-aux/source/Meta_getStringByBitfield.cpp @@ -173,16 +173,6 @@ const std::string & Meta::getString(const PathMetricMask glbitfield) return none; } -const std::string & Meta::getString(const PathRenderingMaskNV glbitfield) -{ - const auto i = Meta_StringsByPathRenderingMaskNV.find(glbitfield); - if (i != Meta_StringsByPathRenderingMaskNV.end()) - { - return i->second; - } - return none; -} - const std::string & Meta::getString(const PerformanceQueryCapsMaskINTEL glbitfield) { const auto i = Meta_StringsByPerformanceQueryCapsMaskINTEL.find(glbitfield); diff --git a/source/glbinding-aux/source/glrevision.h b/source/glbinding-aux/source/glrevision.h index 520d5b8ab..fa856ace8 100644 --- a/source/glbinding-aux/source/glrevision.h +++ b/source/glbinding-aux/source/glrevision.h @@ -6,7 +6,7 @@ namespace glbinding { -const unsigned int GL_REVISION = 20230211; ///< The revision of the gl.xml at the time of code generation. +const unsigned int GL_REVISION = 20240227; ///< The revision of the gl.xml at the time of code generation. } // namespace glbinding \ No newline at end of file diff --git a/source/glbinding-aux/source/types_to_string.cpp b/source/glbinding-aux/source/types_to_string.cpp index d28b6bd0c..ede00b87d 100644 --- a/source/glbinding-aux/source/types_to_string.cpp +++ b/source/glbinding-aux/source/types_to_string.cpp @@ -136,12 +136,6 @@ std::ostream & operator<<(std::ostream & stream, const PathMetricMask & value) return stream; } -std::ostream & operator<<(std::ostream & stream, const PathRenderingMaskNV & value) -{ - stream << glbinding::aux::bitfieldString(value); - return stream; -} - std::ostream & operator<<(std::ostream & stream, const PerformanceQueryCapsMaskINTEL & value) { stream << glbinding::aux::bitfieldString(value); @@ -542,18 +536,6 @@ if (typeid(*value) == typeid(Value)) } - if (typeid(*value) == typeid(Value)) - { - return stream << *reinterpret_cast*>(value); - } - - - if (typeid(*value) == typeid(Value)) - { - return stream << *reinterpret_cast*>(value); - } - - if (typeid(*value) == typeid(Value)) { return stream << *reinterpret_cast*>(value); diff --git a/source/glbinding/include/glbinding/Binding.h b/source/glbinding/include/glbinding/Binding.h index 45722a4d2..4a66360c5 100644 --- a/source/glbinding/include/glbinding/Binding.h +++ b/source/glbinding/include/glbinding/Binding.h @@ -64,7 +64,7 @@ class GLBINDING_API Binding using ContextSwitchCallback = std::function; ///< The signature of the context switch callback - using array_t = std::array; ///< The type of the build-in functions collection + using array_t = std::array; ///< The type of the build-in functions collection public: @@ -98,7 +98,6 @@ class GLBINDING_API Binding * * glxGetProcAddress * * glfwGetProcAddress * * QOpenGlContext::getProcAddress - * * reinterpret_cast(SDL_GL_GetProcAddress) */ static void initialize(glbinding::GetProcAddress functionPointerResolver, bool resolveFunctions = true); @@ -583,6 +582,8 @@ class GLBINDING_API Binding static Function BlendParameteriNV; ///< Wrapper for glBlendParameteriNV static Function BlitFramebuffer; ///< Wrapper for glBlitFramebuffer static Function BlitFramebufferEXT; ///< Wrapper for glBlitFramebufferEXT + static Function BlitFramebufferLayerEXT; ///< Wrapper for glBlitFramebufferLayerEXT + static Function BlitFramebufferLayersEXT; ///< Wrapper for glBlitFramebufferLayersEXT static Function BlitNamedFramebuffer; ///< Wrapper for glBlitNamedFramebuffer static Function BufferAddressRangeNV; ///< Wrapper for glBufferAddressRangeNV static Function BufferAttachMemoryNV; ///< Wrapper for glBufferAttachMemoryNV diff --git a/source/glbinding/include/glbinding/gl/bitfield.h b/source/glbinding/include/glbinding/gl/bitfield.h index 0473db97b..bdf6f5875 100644 --- a/source/glbinding/include/glbinding/gl/bitfield.h +++ b/source/glbinding/include/glbinding/gl/bitfield.h @@ -237,37 +237,6 @@ enum class PathMetricMask : unsigned int }; -enum class PathRenderingMaskNV : unsigned int -{ - GL_NONE_BIT = 0x0, // Generic GL_NONE_BIT - GL_BOLD_BIT_NV = 0x01, // reuse from PathFontStyle - GL_GLYPH_WIDTH_BIT_NV = 0x01, // reuse from PathMetricMask - GL_ITALIC_BIT_NV = 0x02, // reuse from PathFontStyle - GL_GLYPH_HEIGHT_BIT_NV = 0x02, // reuse from PathMetricMask - GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = 0x04, // reuse from PathMetricMask - GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = 0x08, // reuse from PathMetricMask - GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = 0x10, // reuse from PathMetricMask - GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = 0x20, // reuse from PathMetricMask - GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = 0x40, // reuse from PathMetricMask - GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = 0x80, // reuse from PathMetricMask - GL_GLYPH_HAS_KERNING_BIT_NV = 0x100, // reuse from PathMetricMask - GL_FONT_X_MIN_BOUNDS_BIT_NV = 0x00010000, // reuse from PathMetricMask - GL_FONT_Y_MIN_BOUNDS_BIT_NV = 0x00020000, // reuse from PathMetricMask - GL_FONT_X_MAX_BOUNDS_BIT_NV = 0x00040000, // reuse from PathMetricMask - GL_FONT_Y_MAX_BOUNDS_BIT_NV = 0x00080000, // reuse from PathMetricMask - GL_FONT_UNITS_PER_EM_BIT_NV = 0x00100000, // reuse from PathMetricMask - GL_FONT_ASCENDER_BIT_NV = 0x00200000, // reuse from PathMetricMask - GL_FONT_DESCENDER_BIT_NV = 0x00400000, // reuse from PathMetricMask - GL_FONT_HEIGHT_BIT_NV = 0x00800000, // reuse from PathMetricMask - GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = 0x01000000, // reuse from PathMetricMask - GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = 0x02000000, // reuse from PathMetricMask - GL_FONT_UNDERLINE_POSITION_BIT_NV = 0x04000000, // reuse from PathMetricMask - GL_FONT_UNDERLINE_THICKNESS_BIT_NV = 0x08000000, // reuse from PathMetricMask - GL_FONT_HAS_KERNING_BIT_NV = 0x10000000, // reuse from PathMetricMask - GL_FONT_NUM_GLYPH_INDICES_BIT_NV = 0x20000000 // reuse from PathMetricMask -}; - - enum class PerformanceQueryCapsMaskINTEL : unsigned int { GL_PERFQUERY_SINGLE_CONTEXT_INTEL = 0x00000000, @@ -353,7 +322,7 @@ GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_ATOMIC_COUNTER_BARRIER_BIT GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = MemoryBarrierMask::GL_ATOMIC_COUNTER_BARRIER_BIT_EXT; GLBINDING_CONSTEXPR static const FragmentShaderColorModMaskATI GL_BIAS_BIT_ATI = FragmentShaderColorModMaskATI::GL_BIAS_BIT_ATI; GLBINDING_CONSTEXPR static const FragmentShaderDestMaskATI GL_BLUE_BIT_ATI = FragmentShaderDestMaskATI::GL_BLUE_BIT_ATI; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_BOLD_BIT_NV = PathFontStyle::GL_BOLD_BIT_NV; +GLBINDING_CONSTEXPR static const PathFontStyle GL_BOLD_BIT_NV = PathFontStyle::GL_BOLD_BIT_NV; GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_BUFFER_UPDATE_BARRIER_BIT = MemoryBarrierMask::GL_BUFFER_UPDATE_BARRIER_BIT; GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_BUFFER_UPDATE_BARRIER_BIT_EXT = MemoryBarrierMask::GL_BUFFER_UPDATE_BARRIER_BIT_EXT; GLBINDING_CONSTEXPR static const ClientAttribMask GL_CLIENT_ALL_ATTRIB_BITS = ClientAttribMask::GL_CLIENT_ALL_ATTRIB_BITS; @@ -387,40 +356,40 @@ GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_ELEMENT_ARRAY_BARRIER_BIT_ GLBINDING_CONSTEXPR static const AttribMask GL_ENABLE_BIT = AttribMask::GL_ENABLE_BIT; GLBINDING_CONSTEXPR static const AttribMask GL_EVAL_BIT = AttribMask::GL_EVAL_BIT; GLBINDING_CONSTEXPR static const AttribMask GL_FOG_BIT = AttribMask::GL_FOG_BIT; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_ASCENDER_BIT_NV = PathMetricMask::GL_FONT_ASCENDER_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_DESCENDER_BIT_NV = PathMetricMask::GL_FONT_DESCENDER_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_HAS_KERNING_BIT_NV = PathMetricMask::GL_FONT_HAS_KERNING_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_HEIGHT_BIT_NV = PathMetricMask::GL_FONT_HEIGHT_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = PathMetricMask::GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = PathMetricMask::GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_NUM_GLYPH_INDICES_BIT_NV = PathMetricMask::GL_FONT_NUM_GLYPH_INDICES_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_UNDERLINE_POSITION_BIT_NV = PathMetricMask::GL_FONT_UNDERLINE_POSITION_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_UNDERLINE_THICKNESS_BIT_NV = PathMetricMask::GL_FONT_UNDERLINE_THICKNESS_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_UNITS_PER_EM_BIT_NV = PathMetricMask::GL_FONT_UNITS_PER_EM_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_X_MAX_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_X_MAX_BOUNDS_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_X_MIN_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_X_MIN_BOUNDS_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_Y_MAX_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_Y_MAX_BOUNDS_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_FONT_Y_MIN_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_Y_MIN_BOUNDS_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_ASCENDER_BIT_NV = PathMetricMask::GL_FONT_ASCENDER_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_DESCENDER_BIT_NV = PathMetricMask::GL_FONT_DESCENDER_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_HAS_KERNING_BIT_NV = PathMetricMask::GL_FONT_HAS_KERNING_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_HEIGHT_BIT_NV = PathMetricMask::GL_FONT_HEIGHT_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = PathMetricMask::GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = PathMetricMask::GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_NUM_GLYPH_INDICES_BIT_NV = PathMetricMask::GL_FONT_NUM_GLYPH_INDICES_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_UNDERLINE_POSITION_BIT_NV = PathMetricMask::GL_FONT_UNDERLINE_POSITION_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_UNDERLINE_THICKNESS_BIT_NV = PathMetricMask::GL_FONT_UNDERLINE_THICKNESS_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_UNITS_PER_EM_BIT_NV = PathMetricMask::GL_FONT_UNITS_PER_EM_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_X_MAX_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_X_MAX_BOUNDS_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_X_MIN_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_X_MIN_BOUNDS_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_Y_MAX_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_Y_MAX_BOUNDS_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_FONT_Y_MIN_BOUNDS_BIT_NV = PathMetricMask::GL_FONT_Y_MIN_BOUNDS_BIT_NV; GLBINDING_CONSTEXPR static const UseProgramStageMask GL_FRAGMENT_SHADER_BIT = UseProgramStageMask::GL_FRAGMENT_SHADER_BIT; GLBINDING_CONSTEXPR static const UseProgramStageMask GL_FRAGMENT_SHADER_BIT_EXT = UseProgramStageMask::GL_FRAGMENT_SHADER_BIT_EXT; GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_FRAMEBUFFER_BARRIER_BIT = MemoryBarrierMask::GL_FRAMEBUFFER_BARRIER_BIT; GLBINDING_CONSTEXPR static const MemoryBarrierMask GL_FRAMEBUFFER_BARRIER_BIT_EXT = MemoryBarrierMask::GL_FRAMEBUFFER_BARRIER_BIT_EXT; GLBINDING_CONSTEXPR static const FfdMaskSGIX GL_GEOMETRY_DEFORMATION_BIT_SGIX = FfdMaskSGIX::GL_GEOMETRY_DEFORMATION_BIT_SGIX; GLBINDING_CONSTEXPR static const UseProgramStageMask GL_GEOMETRY_SHADER_BIT = UseProgramStageMask::GL_GEOMETRY_SHADER_BIT; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_HAS_KERNING_BIT_NV = PathMetricMask::GL_GLYPH_HAS_KERNING_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_HEIGHT_BIT_NV = PathMetricMask::GL_GLYPH_HEIGHT_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_X_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_GLYPH_WIDTH_BIT_NV = PathMetricMask::GL_GLYPH_WIDTH_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_HAS_KERNING_BIT_NV = PathMetricMask::GL_GLYPH_HAS_KERNING_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_HEIGHT_BIT_NV = PathMetricMask::GL_GLYPH_HEIGHT_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = PathMetricMask::GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_X_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = PathMetricMask::GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV; +GLBINDING_CONSTEXPR static const PathMetricMask GL_GLYPH_WIDTH_BIT_NV = PathMetricMask::GL_GLYPH_WIDTH_BIT_NV; GLBINDING_CONSTEXPR static const FragmentShaderDestMaskATI GL_GREEN_BIT_ATI = FragmentShaderDestMaskATI::GL_GREEN_BIT_ATI; GLBINDING_CONSTEXPR static const FragmentShaderDestModMaskATI GL_HALF_BIT_ATI = FragmentShaderDestModMaskATI::GL_HALF_BIT_ATI; GLBINDING_CONSTEXPR static const AttribMask GL_HINT_BIT = AttribMask::GL_HINT_BIT; GLBINDING_CONSTEXPR static const VertexHintsMaskPGI GL_INDEX_BIT_PGI = VertexHintsMaskPGI::GL_INDEX_BIT_PGI; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_ITALIC_BIT_NV = PathFontStyle::GL_ITALIC_BIT_NV; +GLBINDING_CONSTEXPR static const PathFontStyle GL_ITALIC_BIT_NV = PathFontStyle::GL_ITALIC_BIT_NV; GLBINDING_CONSTEXPR static const BufferStorageMask GL_LGPU_SEPARATE_STORAGE_BIT_NVX = BufferStorageMask::GL_LGPU_SEPARATE_STORAGE_BIT_NVX; GLBINDING_CONSTEXPR static const AttribMask GL_LIGHTING_BIT = AttribMask::GL_LIGHTING_BIT; GLBINDING_CONSTEXPR static const AttribMask GL_LINE_BIT = AttribMask::GL_LINE_BIT; @@ -446,7 +415,7 @@ GLBINDING_CONSTEXPR static const AttribMask GL_MULTISAMPLE_BIT_3DFX = AttribMask GLBINDING_CONSTEXPR static const AttribMask GL_MULTISAMPLE_BIT_ARB = AttribMask::GL_MULTISAMPLE_BIT_ARB; GLBINDING_CONSTEXPR static const AttribMask GL_MULTISAMPLE_BIT_EXT = AttribMask::GL_MULTISAMPLE_BIT_EXT; GLBINDING_CONSTEXPR static const FragmentShaderColorModMaskATI GL_NEGATE_BIT_ATI = FragmentShaderColorModMaskATI::GL_NEGATE_BIT_ATI; -GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_NONE_BIT = AttribMask::GL_NONE_BIT; +GLBINDING_CONSTEXPR static const glbinding::SharedBitfield GL_NONE_BIT = AttribMask::GL_NONE_BIT; GLBINDING_CONSTEXPR static const VertexHintsMaskPGI GL_NORMAL_BIT_PGI = VertexHintsMaskPGI::GL_NORMAL_BIT_PGI; GLBINDING_CONSTEXPR static const BufferStorageMask GL_PER_GPU_STORAGE_BIT_NV = BufferStorageMask::GL_PER_GPU_STORAGE_BIT_NV; GLBINDING_CONSTEXPR static const PerformanceQueryCapsMaskINTEL GL_PERFQUERY_GLOBAL_CONTEXT_INTEL = PerformanceQueryCapsMaskINTEL::GL_PERFQUERY_GLOBAL_CONTEXT_INTEL; diff --git a/source/glbinding/include/glbinding/gl/enum.h b/source/glbinding/include/glbinding/gl/enum.h index 18cbbf67f..1227c1dff 100644 --- a/source/glbinding/include/glbinding/gl/enum.h +++ b/source/glbinding/include/glbinding/gl/enum.h @@ -428,8 +428,12 @@ enum class GLenum : unsigned int // GL_BYTE = 0x1400, // reuse BinormalPointerTypeEXT GL_UNSIGNED_BYTE = 0x1401, +// GL_SHORT = 0x1402, // reuse BinormalPointerTypeEXT GL_UNSIGNED_SHORT = 0x1403, +// GL_INT = 0x1404, // reuse AttributeType // GL_UNSIGNED_INT = 0x1405, // reuse AttributeType +// GL_FLOAT = 0x1406, // reuse AttributeType +// GL_DOUBLE = 0x140A, // reuse AttributeType // ColorTableParameterPName @@ -2245,6 +2249,13 @@ enum class GLenum : unsigned int // GL_FLOAT = 0x1406, // reuse AttributeType // GL_DOUBLE = 0x140A, // reuse AttributeType + // InstancedPathCoverMode + + GL_PATH_FILL_COVER_MODE_NV = 0x9082, + GL_CONVEX_HULL_NV = 0x908B, + GL_BOUNDING_BOX_NV = 0x908D, + GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C, + // InterleavedArrayFormat GL_V2F = 0x2A20, @@ -2738,6 +2749,9 @@ enum class GLenum : unsigned int // LightParameter +// GL_AMBIENT = 0x1200, // reuse ColorMaterialParameter +// GL_DIFFUSE = 0x1201, // reuse ColorMaterialParameter +// GL_SPECULAR = 0x1202, // reuse ColorMaterialParameter // GL_POSITION = 0x1203, // reuse FragmentLightParameterSGIX // GL_SPOT_DIRECTION = 0x1204, // reuse FragmentLightParameterSGIX // GL_SPOT_EXPONENT = 0x1205, // reuse FragmentLightParameterSGIX @@ -3006,10 +3020,9 @@ enum class GLenum : unsigned int // PathCoverMode - GL_PATH_FILL_COVER_MODE_NV = 0x9082, - GL_CONVEX_HULL_NV = 0x908B, - GL_BOUNDING_BOX_NV = 0x908D, - GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C, +// GL_PATH_FILL_COVER_MODE_NV = 0x9082, // reuse InstancedPathCoverMode +// GL_CONVEX_HULL_NV = 0x908B, // reuse InstancedPathCoverMode +// GL_BOUNDING_BOX_NV = 0x908D, // reuse InstancedPathCoverMode // PathElementType @@ -3063,7 +3076,7 @@ enum class GLenum : unsigned int GL_PATH_CLIENT_LENGTH_NV = 0x907F, // GL_PATH_FILL_MODE_NV = 0x9080, // reuse PathFillMode GL_PATH_FILL_MASK_NV = 0x9081, -// GL_PATH_FILL_COVER_MODE_NV = 0x9082, // reuse PathCoverMode +// GL_PATH_FILL_COVER_MODE_NV = 0x9082, // reuse InstancedPathCoverMode GL_PATH_STROKE_COVER_MODE_NV = 0x9083, GL_PATH_STROKE_MASK_NV = 0x9084, // GL_PATH_OBJECT_BOUNDING_BOX_NV = 0x908A, // reuse PathGenMode @@ -3141,6 +3154,12 @@ enum class GLenum : unsigned int GL_TRANSPOSE_AFFINE_2D_NV = 0x9096, GL_TRANSPOSE_AFFINE_3D_NV = 0x9098, + // PerfQueryDataFlags + + GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9, + GL_PERFQUERY_FLUSH_INTEL = 0x83FA, + GL_PERFQUERY_WAIT_INTEL = 0x83FB, + // PipelineParameterName GL_ACTIVE_PROGRAM = 0x8259, @@ -4491,7 +4510,6 @@ enum class GLenum : unsigned int // TextureWrapMode -// GL_LINEAR_MIPMAP_LINEAR = 0x2703, // reuse TextureMinFilter GL_CLAMP = 0x2900, GL_REPEAT = 0x2901, GL_CLAMP_TO_BORDER = 0x812D, @@ -4500,6 +4518,8 @@ enum class GLenum : unsigned int GL_CLAMP_TO_EDGE = 0x812F, GL_CLAMP_TO_EDGE_SGIS = 0x812F, GL_MIRRORED_REPEAT = 0x8370, + GL_MIRRORED_REPEAT_ARB = 0x8370, + GL_MIRRORED_REPEAT_IBM = 0x8370, // TransformFeedbackBufferMode @@ -4838,8 +4858,6 @@ enum class GLenum : unsigned int GL_TEXTURE_MATERIAL_FACE_EXT = 0x8351, GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352, GL_PIXEL_GROUP_COLOR_SGIS = 0x8356, - GL_MIRRORED_REPEAT_ARB = 0x8370, - GL_MIRRORED_REPEAT_IBM = 0x8370, GL_RGB_S3TC = 0x83A0, GL_RGB4_S3TC = 0x83A1, GL_RGBA_S3TC = 0x83A2, @@ -4851,9 +4869,6 @@ enum class GLenum : unsigned int GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F6, GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F7, GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F8, - GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9, - GL_PERFQUERY_FLUSH_INTEL = 0x83FA, - GL_PERFQUERY_WAIT_INTEL = 0x83FB, GL_BLACKHOLE_RENDER_INTEL = 0x83FC, GL_CONSERVATIVE_RASTERIZATION_INTEL = 0x83FE, GL_CURRENT_RASTER_NORMAL_SGIX = 0x8406, @@ -7533,8 +7548,12 @@ GLBINDING_CONSTEXPR static const GLenum GL_AMBIENT_AND_DIFFUSE = GLenum::GL_AMBI // GLBINDING_CONSTEXPR static const GLenum GL_BYTE = GLenum::GL_BYTE; // reuse BinormalPointerTypeEXT GLBINDING_CONSTEXPR static const GLenum GL_UNSIGNED_BYTE = GLenum::GL_UNSIGNED_BYTE; +// GLBINDING_CONSTEXPR static const GLenum GL_SHORT = GLenum::GL_SHORT; // reuse BinormalPointerTypeEXT GLBINDING_CONSTEXPR static const GLenum GL_UNSIGNED_SHORT = GLenum::GL_UNSIGNED_SHORT; +// GLBINDING_CONSTEXPR static const GLenum GL_INT = GLenum::GL_INT; // reuse AttributeType // GLBINDING_CONSTEXPR static const GLenum GL_UNSIGNED_INT = GLenum::GL_UNSIGNED_INT; // reuse AttributeType +// GLBINDING_CONSTEXPR static const GLenum GL_FLOAT = GLenum::GL_FLOAT; // reuse AttributeType +// GLBINDING_CONSTEXPR static const GLenum GL_DOUBLE = GLenum::GL_DOUBLE; // reuse AttributeType // ColorTableParameterPName @@ -9350,6 +9369,13 @@ GLBINDING_CONSTEXPR static const GLenum GL_IMAGE_TRANSFORM_2D_HP = GLenum::GL_IM // GLBINDING_CONSTEXPR static const GLenum GL_FLOAT = GLenum::GL_FLOAT; // reuse AttributeType // GLBINDING_CONSTEXPR static const GLenum GL_DOUBLE = GLenum::GL_DOUBLE; // reuse AttributeType +// InstancedPathCoverMode + +GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_COVER_MODE_NV = GLenum::GL_PATH_FILL_COVER_MODE_NV; +GLBINDING_CONSTEXPR static const GLenum GL_CONVEX_HULL_NV = GLenum::GL_CONVEX_HULL_NV; +GLBINDING_CONSTEXPR static const GLenum GL_BOUNDING_BOX_NV = GLenum::GL_BOUNDING_BOX_NV; +GLBINDING_CONSTEXPR static const GLenum GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = GLenum::GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV; + // InterleavedArrayFormat GLBINDING_CONSTEXPR static const GLenum GL_V2F = GLenum::GL_V2F; @@ -9843,6 +9869,9 @@ GLBINDING_CONSTEXPR static const GLenum GL_LIGHT_MODEL_COLOR_CONTROL_EXT = GLenu // LightParameter +// GLBINDING_CONSTEXPR static const GLenum GL_AMBIENT = GLenum::GL_AMBIENT; // reuse ColorMaterialParameter +// GLBINDING_CONSTEXPR static const GLenum GL_DIFFUSE = GLenum::GL_DIFFUSE; // reuse ColorMaterialParameter +// GLBINDING_CONSTEXPR static const GLenum GL_SPECULAR = GLenum::GL_SPECULAR; // reuse ColorMaterialParameter // GLBINDING_CONSTEXPR static const GLenum GL_POSITION = GLenum::GL_POSITION; // reuse FragmentLightParameterSGIX // GLBINDING_CONSTEXPR static const GLenum GL_SPOT_DIRECTION = GLenum::GL_SPOT_DIRECTION; // reuse FragmentLightParameterSGIX // GLBINDING_CONSTEXPR static const GLenum GL_SPOT_EXPONENT = GLenum::GL_SPOT_EXPONENT; // reuse FragmentLightParameterSGIX @@ -10111,10 +10140,9 @@ GLBINDING_CONSTEXPR static const GLenum GL_RELATIVE_ARC_TO_NV = GLenum::GL_RELAT // PathCoverMode -GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_COVER_MODE_NV = GLenum::GL_PATH_FILL_COVER_MODE_NV; -GLBINDING_CONSTEXPR static const GLenum GL_CONVEX_HULL_NV = GLenum::GL_CONVEX_HULL_NV; -GLBINDING_CONSTEXPR static const GLenum GL_BOUNDING_BOX_NV = GLenum::GL_BOUNDING_BOX_NV; -GLBINDING_CONSTEXPR static const GLenum GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = GLenum::GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV; +// GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_COVER_MODE_NV = GLenum::GL_PATH_FILL_COVER_MODE_NV; // reuse InstancedPathCoverMode +// GLBINDING_CONSTEXPR static const GLenum GL_CONVEX_HULL_NV = GLenum::GL_CONVEX_HULL_NV; // reuse InstancedPathCoverMode +// GLBINDING_CONSTEXPR static const GLenum GL_BOUNDING_BOX_NV = GLenum::GL_BOUNDING_BOX_NV; // reuse InstancedPathCoverMode // PathElementType @@ -10168,7 +10196,7 @@ GLBINDING_CONSTEXPR static const GLenum GL_PATH_DASH_OFFSET_NV = GLenum::GL_PATH GLBINDING_CONSTEXPR static const GLenum GL_PATH_CLIENT_LENGTH_NV = GLenum::GL_PATH_CLIENT_LENGTH_NV; // GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_MODE_NV = GLenum::GL_PATH_FILL_MODE_NV; // reuse PathFillMode GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_MASK_NV = GLenum::GL_PATH_FILL_MASK_NV; -// GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_COVER_MODE_NV = GLenum::GL_PATH_FILL_COVER_MODE_NV; // reuse PathCoverMode +// GLBINDING_CONSTEXPR static const GLenum GL_PATH_FILL_COVER_MODE_NV = GLenum::GL_PATH_FILL_COVER_MODE_NV; // reuse InstancedPathCoverMode GLBINDING_CONSTEXPR static const GLenum GL_PATH_STROKE_COVER_MODE_NV = GLenum::GL_PATH_STROKE_COVER_MODE_NV; GLBINDING_CONSTEXPR static const GLenum GL_PATH_STROKE_MASK_NV = GLenum::GL_PATH_STROKE_MASK_NV; // GLBINDING_CONSTEXPR static const GLenum GL_PATH_OBJECT_BOUNDING_BOX_NV = GLenum::GL_PATH_OBJECT_BOUNDING_BOX_NV; // reuse PathGenMode @@ -10246,6 +10274,12 @@ GLBINDING_CONSTEXPR static const GLenum GL_AFFINE_3D_NV = GLenum::GL_AFFINE_3D_N GLBINDING_CONSTEXPR static const GLenum GL_TRANSPOSE_AFFINE_2D_NV = GLenum::GL_TRANSPOSE_AFFINE_2D_NV; GLBINDING_CONSTEXPR static const GLenum GL_TRANSPOSE_AFFINE_3D_NV = GLenum::GL_TRANSPOSE_AFFINE_3D_NV; +// PerfQueryDataFlags + +GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_DONOT_FLUSH_INTEL = GLenum::GL_PERFQUERY_DONOT_FLUSH_INTEL; +GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_FLUSH_INTEL = GLenum::GL_PERFQUERY_FLUSH_INTEL; +GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_WAIT_INTEL = GLenum::GL_PERFQUERY_WAIT_INTEL; + // PipelineParameterName GLBINDING_CONSTEXPR static const GLenum GL_ACTIVE_PROGRAM = GLenum::GL_ACTIVE_PROGRAM; @@ -11596,7 +11630,6 @@ GLBINDING_CONSTEXPR static const GLenum GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = // TextureWrapMode -// GLBINDING_CONSTEXPR static const GLenum GL_LINEAR_MIPMAP_LINEAR = GLenum::GL_LINEAR_MIPMAP_LINEAR; // reuse TextureMinFilter GLBINDING_CONSTEXPR static const GLenum GL_CLAMP = GLenum::GL_CLAMP; GLBINDING_CONSTEXPR static const GLenum GL_REPEAT = GLenum::GL_REPEAT; GLBINDING_CONSTEXPR static const GLenum GL_CLAMP_TO_BORDER = GLenum::GL_CLAMP_TO_BORDER; @@ -11605,6 +11638,8 @@ GLBINDING_CONSTEXPR static const GLenum GL_CLAMP_TO_BORDER_SGIS = GLenum::GL_CLA GLBINDING_CONSTEXPR static const GLenum GL_CLAMP_TO_EDGE = GLenum::GL_CLAMP_TO_EDGE; GLBINDING_CONSTEXPR static const GLenum GL_CLAMP_TO_EDGE_SGIS = GLenum::GL_CLAMP_TO_EDGE_SGIS; GLBINDING_CONSTEXPR static const GLenum GL_MIRRORED_REPEAT = GLenum::GL_MIRRORED_REPEAT; +GLBINDING_CONSTEXPR static const GLenum GL_MIRRORED_REPEAT_ARB = GLenum::GL_MIRRORED_REPEAT_ARB; +GLBINDING_CONSTEXPR static const GLenum GL_MIRRORED_REPEAT_IBM = GLenum::GL_MIRRORED_REPEAT_IBM; // TransformFeedbackBufferMode @@ -11943,8 +11978,6 @@ GLBINDING_CONSTEXPR static const GLenum GL_TEXTURE_LIGHT_EXT = GLenum::GL_TEXTUR GLBINDING_CONSTEXPR static const GLenum GL_TEXTURE_MATERIAL_FACE_EXT = GLenum::GL_TEXTURE_MATERIAL_FACE_EXT; GLBINDING_CONSTEXPR static const GLenum GL_TEXTURE_MATERIAL_PARAMETER_EXT = GLenum::GL_TEXTURE_MATERIAL_PARAMETER_EXT; GLBINDING_CONSTEXPR static const GLenum GL_PIXEL_GROUP_COLOR_SGIS = GLenum::GL_PIXEL_GROUP_COLOR_SGIS; -GLBINDING_CONSTEXPR static const GLenum GL_MIRRORED_REPEAT_ARB = GLenum::GL_MIRRORED_REPEAT_ARB; -GLBINDING_CONSTEXPR static const GLenum GL_MIRRORED_REPEAT_IBM = GLenum::GL_MIRRORED_REPEAT_IBM; GLBINDING_CONSTEXPR static const GLenum GL_RGB_S3TC = GLenum::GL_RGB_S3TC; GLBINDING_CONSTEXPR static const GLenum GL_RGB4_S3TC = GLenum::GL_RGB4_S3TC; GLBINDING_CONSTEXPR static const GLenum GL_RGBA_S3TC = GLenum::GL_RGBA_S3TC; @@ -11956,9 +11989,6 @@ GLBINDING_CONSTEXPR static const GLenum GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL GLBINDING_CONSTEXPR static const GLenum GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = GLenum::GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL; GLBINDING_CONSTEXPR static const GLenum GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = GLenum::GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL; GLBINDING_CONSTEXPR static const GLenum GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = GLenum::GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL; -GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_DONOT_FLUSH_INTEL = GLenum::GL_PERFQUERY_DONOT_FLUSH_INTEL; -GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_FLUSH_INTEL = GLenum::GL_PERFQUERY_FLUSH_INTEL; -GLBINDING_CONSTEXPR static const GLenum GL_PERFQUERY_WAIT_INTEL = GLenum::GL_PERFQUERY_WAIT_INTEL; GLBINDING_CONSTEXPR static const GLenum GL_BLACKHOLE_RENDER_INTEL = GLenum::GL_BLACKHOLE_RENDER_INTEL; GLBINDING_CONSTEXPR static const GLenum GL_CONSERVATIVE_RASTERIZATION_INTEL = GLenum::GL_CONSERVATIVE_RASTERIZATION_INTEL; GLBINDING_CONSTEXPR static const GLenum GL_CURRENT_RASTER_NORMAL_SGIX = GLenum::GL_CURRENT_RASTER_NORMAL_SGIX; diff --git a/source/glbinding/include/glbinding/gl/extension.h b/source/glbinding/include/glbinding/gl/extension.h index 10db97f7e..7136ebdd2 100644 --- a/source/glbinding/include/glbinding/gl/extension.h +++ b/source/glbinding/include/glbinding/gl/extension.h @@ -284,6 +284,7 @@ enum class GLextension : int // GLextension is not a type introduced by GL API s GL_EXT_external_buffer, GL_EXT_fog_coord, GL_EXT_framebuffer_blit, + GL_EXT_framebuffer_blit_layers, GL_EXT_framebuffer_multisample, GL_EXT_framebuffer_multisample_blit_scaled, GL_EXT_framebuffer_object, @@ -527,6 +528,7 @@ enum class GLextension : int // GLextension is not a type introduced by GL API s GL_NV_timeline_semaphore, GL_NV_transform_feedback, GL_NV_transform_feedback2, + GL_NV_uniform_buffer_std430_layout, GL_NV_uniform_buffer_unified_memory, GL_NV_vdpau_interop, GL_NV_vdpau_interop2, diff --git a/source/glbinding/include/glbinding/gl/functions.h b/source/glbinding/include/glbinding/gl/functions.h index 68f2dcae6..490c7e055 100644 --- a/source/glbinding/include/glbinding/gl/functions.h +++ b/source/glbinding/include/glbinding/gl/functions.h @@ -149,6 +149,8 @@ GLBINDING_API void glBlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, GLBINDING_API void glBlendParameteriNV(GLenum pname, GLint value); GLBINDING_API void glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter); GLBINDING_API void glBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter); +GLBINDING_API void glBlitFramebufferLayerEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, ClearBufferMask mask, GLenum filter); +GLBINDING_API void glBlitFramebufferLayersEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter); GLBINDING_API void glBlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter); GLBINDING_API void glBufferAddressRangeNV(GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); GLBINDING_API void glBufferAttachMemoryNV(GLenum target, GLuint memory, GLuint64 offset); diff --git a/source/glbinding/include/glbinding/gl/types.h b/source/glbinding/include/glbinding/gl/types.h index daac50bd2..8bfbb6724 100644 --- a/source/glbinding/include/glbinding/gl/types.h +++ b/source/glbinding/include/glbinding/gl/types.h @@ -49,7 +49,6 @@ enum class MemoryBarrierMask : unsigned int; enum class OcclusionQueryEventMaskAMD : unsigned int; enum class PathFontStyle : unsigned int; enum class PathMetricMask : unsigned int; -enum class PathRenderingMaskNV : unsigned int; enum class PerformanceQueryCapsMaskINTEL : unsigned int; enum class SyncObjectMask : unsigned int; enum class TextureStorageMaskAMD : unsigned int; diff --git a/source/glbinding/include/glbinding/gl/types.inl b/source/glbinding/include/glbinding/gl/types.inl index 6794673f2..3cb67307d 100644 --- a/source/glbinding/include/glbinding/gl/types.inl +++ b/source/glbinding/include/glbinding/gl/types.inl @@ -1036,67 +1036,6 @@ namespace std { -template<> -struct hash -{ - std::size_t operator()(const gl::PathRenderingMaskNV & t) const - { - return hash::type>()(static_cast::type>(t)); - } -}; - - -} // namespace std - - -namespace gl -{ - - -GLBINDING_CONSTEXPR inline PathRenderingMaskNV operator|(const PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - return static_cast(static_cast::type>(a) | static_cast::type>(b)); -} - -inline PathRenderingMaskNV & operator|=(PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - a = static_cast(static_cast::type>(a) | static_cast::type>(b)); - - return a; -} - -GLBINDING_CONSTEXPR inline PathRenderingMaskNV operator&(const PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - return static_cast(static_cast::type>(a) & static_cast::type>(b)); -} - -inline PathRenderingMaskNV & operator&=(PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - a = static_cast(static_cast::type>(a) & static_cast::type>(b)); - - return a; -} - -GLBINDING_CONSTEXPR inline PathRenderingMaskNV operator^(const PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - return static_cast(static_cast::type>(a) ^ static_cast::type>(b)); -} - -inline PathRenderingMaskNV & operator^=(PathRenderingMaskNV & a, const PathRenderingMaskNV & b) -{ - a = static_cast(static_cast::type>(a) ^ static_cast::type>(b)); - - return a; -} - - -} // namespace gl - - -namespace std -{ - - template<> struct hash { diff --git a/source/glbinding/include/glbinding/gl10/types.h b/source/glbinding/include/glbinding/gl10/types.h index 7d8ace402..d6dbe9a49 100644 --- a/source/glbinding/include/glbinding/gl10/types.h +++ b/source/glbinding/include/glbinding/gl10/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl10ext/functions.h b/source/glbinding/include/glbinding/gl10ext/functions.h index f5339aaf6..787fe2132 100644 --- a/source/glbinding/include/glbinding/gl10ext/functions.h +++ b/source/glbinding/include/glbinding/gl10ext/functions.h @@ -142,6 +142,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl10ext/types.h b/source/glbinding/include/glbinding/gl10ext/types.h index c2cf4e0a4..17ac8f5e5 100644 --- a/source/glbinding/include/glbinding/gl10ext/types.h +++ b/source/glbinding/include/glbinding/gl10ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl11/types.h b/source/glbinding/include/glbinding/gl11/types.h index 77da55aba..f4522779e 100644 --- a/source/glbinding/include/glbinding/gl11/types.h +++ b/source/glbinding/include/glbinding/gl11/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl11ext/functions.h b/source/glbinding/include/glbinding/gl11ext/functions.h index 6b704dc15..9f00943b7 100644 --- a/source/glbinding/include/glbinding/gl11ext/functions.h +++ b/source/glbinding/include/glbinding/gl11ext/functions.h @@ -139,6 +139,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl11ext/types.h b/source/glbinding/include/glbinding/gl11ext/types.h index 02e6b34c7..88a09f4ec 100644 --- a/source/glbinding/include/glbinding/gl11ext/types.h +++ b/source/glbinding/include/glbinding/gl11ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl12/types.h b/source/glbinding/include/glbinding/gl12/types.h index 545de27e7..f46ea1cda 100644 --- a/source/glbinding/include/glbinding/gl12/types.h +++ b/source/glbinding/include/glbinding/gl12/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl12ext/functions.h b/source/glbinding/include/glbinding/gl12ext/functions.h index 2f16fe097..af108fe77 100644 --- a/source/glbinding/include/glbinding/gl12ext/functions.h +++ b/source/glbinding/include/glbinding/gl12ext/functions.h @@ -139,6 +139,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl12ext/types.h b/source/glbinding/include/glbinding/gl12ext/types.h index 8d31a18ce..5f215a3fd 100644 --- a/source/glbinding/include/glbinding/gl12ext/types.h +++ b/source/glbinding/include/glbinding/gl12ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl13/types.h b/source/glbinding/include/glbinding/gl13/types.h index 9075f06f9..51d7994b3 100644 --- a/source/glbinding/include/glbinding/gl13/types.h +++ b/source/glbinding/include/glbinding/gl13/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl13ext/functions.h b/source/glbinding/include/glbinding/gl13ext/functions.h index 8fd4be4dc..71353b783 100644 --- a/source/glbinding/include/glbinding/gl13ext/functions.h +++ b/source/glbinding/include/glbinding/gl13ext/functions.h @@ -138,6 +138,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl13ext/types.h b/source/glbinding/include/glbinding/gl13ext/types.h index 9c4ef5fa6..efea4e9c8 100644 --- a/source/glbinding/include/glbinding/gl13ext/types.h +++ b/source/glbinding/include/glbinding/gl13ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl14/types.h b/source/glbinding/include/glbinding/gl14/types.h index a2ff4f76c..255d6fffe 100644 --- a/source/glbinding/include/glbinding/gl14/types.h +++ b/source/glbinding/include/glbinding/gl14/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl14ext/functions.h b/source/glbinding/include/glbinding/gl14ext/functions.h index 47b17bc7b..44cf8f1a7 100644 --- a/source/glbinding/include/glbinding/gl14ext/functions.h +++ b/source/glbinding/include/glbinding/gl14ext/functions.h @@ -135,6 +135,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl14ext/types.h b/source/glbinding/include/glbinding/gl14ext/types.h index 037d25fe1..579a1a88a 100644 --- a/source/glbinding/include/glbinding/gl14ext/types.h +++ b/source/glbinding/include/glbinding/gl14ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl15/types.h b/source/glbinding/include/glbinding/gl15/types.h index 2ca70ea48..eacc6acab 100644 --- a/source/glbinding/include/glbinding/gl15/types.h +++ b/source/glbinding/include/glbinding/gl15/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl15ext/functions.h b/source/glbinding/include/glbinding/gl15ext/functions.h index 2c24add78..d380c4b9e 100644 --- a/source/glbinding/include/glbinding/gl15ext/functions.h +++ b/source/glbinding/include/glbinding/gl15ext/functions.h @@ -133,6 +133,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl15ext/types.h b/source/glbinding/include/glbinding/gl15ext/types.h index eba808296..a865c8bfe 100644 --- a/source/glbinding/include/glbinding/gl15ext/types.h +++ b/source/glbinding/include/glbinding/gl15ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl20/types.h b/source/glbinding/include/glbinding/gl20/types.h index 3f61f3a35..676fd7430 100644 --- a/source/glbinding/include/glbinding/gl20/types.h +++ b/source/glbinding/include/glbinding/gl20/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl20ext/functions.h b/source/glbinding/include/glbinding/gl20ext/functions.h index afdf1319f..e833345d8 100644 --- a/source/glbinding/include/glbinding/gl20ext/functions.h +++ b/source/glbinding/include/glbinding/gl20ext/functions.h @@ -130,6 +130,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl20ext/types.h b/source/glbinding/include/glbinding/gl20ext/types.h index 69fb67965..a98dcde80 100644 --- a/source/glbinding/include/glbinding/gl20ext/types.h +++ b/source/glbinding/include/glbinding/gl20ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl21/types.h b/source/glbinding/include/glbinding/gl21/types.h index 42d6d2f3f..d268cd4e5 100644 --- a/source/glbinding/include/glbinding/gl21/types.h +++ b/source/glbinding/include/glbinding/gl21/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl21ext/functions.h b/source/glbinding/include/glbinding/gl21ext/functions.h index 5aa34c5d1..a9a565504 100644 --- a/source/glbinding/include/glbinding/gl21ext/functions.h +++ b/source/glbinding/include/glbinding/gl21ext/functions.h @@ -130,6 +130,8 @@ using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebuffer; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl21ext/types.h b/source/glbinding/include/glbinding/gl21ext/types.h index 97596ea3b..e06e6d232 100644 --- a/source/glbinding/include/glbinding/gl21ext/types.h +++ b/source/glbinding/include/glbinding/gl21ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl30/types.h b/source/glbinding/include/glbinding/gl30/types.h index b29dc60dd..a42e0de9a 100644 --- a/source/glbinding/include/glbinding/gl30/types.h +++ b/source/glbinding/include/glbinding/gl30/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl30ext/functions.h b/source/glbinding/include/glbinding/gl30ext/functions.h index 20bc89488..dbf8ed1e9 100644 --- a/source/glbinding/include/glbinding/gl30ext/functions.h +++ b/source/glbinding/include/glbinding/gl30ext/functions.h @@ -121,6 +121,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl30ext/types.h b/source/glbinding/include/glbinding/gl30ext/types.h index c36344f3b..16a960f92 100644 --- a/source/glbinding/include/glbinding/gl30ext/types.h +++ b/source/glbinding/include/glbinding/gl30ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl31/types.h b/source/glbinding/include/glbinding/gl31/types.h index d32822004..cc6ceb738 100644 --- a/source/glbinding/include/glbinding/gl31/types.h +++ b/source/glbinding/include/glbinding/gl31/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl31ext/functions.h b/source/glbinding/include/glbinding/gl31ext/functions.h index 8a84e827f..907aca97c 100644 --- a/source/glbinding/include/glbinding/gl31ext/functions.h +++ b/source/glbinding/include/glbinding/gl31ext/functions.h @@ -121,6 +121,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl31ext/types.h b/source/glbinding/include/glbinding/gl31ext/types.h index cb216419b..0fe74a2a6 100644 --- a/source/glbinding/include/glbinding/gl31ext/types.h +++ b/source/glbinding/include/glbinding/gl31ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl32/types.h b/source/glbinding/include/glbinding/gl32/types.h index 6b4fd3452..7d9beacdd 100644 --- a/source/glbinding/include/glbinding/gl32/types.h +++ b/source/glbinding/include/glbinding/gl32/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl32core/types.h b/source/glbinding/include/glbinding/gl32core/types.h index 5526e1ff1..1b28e66c6 100644 --- a/source/glbinding/include/glbinding/gl32core/types.h +++ b/source/glbinding/include/glbinding/gl32core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl32ext/functions.h b/source/glbinding/include/glbinding/gl32ext/functions.h index 9801f97cd..f66c55829 100644 --- a/source/glbinding/include/glbinding/gl32ext/functions.h +++ b/source/glbinding/include/glbinding/gl32ext/functions.h @@ -121,6 +121,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl32ext/types.h b/source/glbinding/include/glbinding/gl32ext/types.h index 93c639232..3aaf7cc28 100644 --- a/source/glbinding/include/glbinding/gl32ext/types.h +++ b/source/glbinding/include/glbinding/gl32ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl33/types.h b/source/glbinding/include/glbinding/gl33/types.h index 883fa073a..159562849 100644 --- a/source/glbinding/include/glbinding/gl33/types.h +++ b/source/glbinding/include/glbinding/gl33/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl33core/types.h b/source/glbinding/include/glbinding/gl33core/types.h index 93381e51d..29f3161d8 100644 --- a/source/glbinding/include/glbinding/gl33core/types.h +++ b/source/glbinding/include/glbinding/gl33core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl33ext/functions.h b/source/glbinding/include/glbinding/gl33ext/functions.h index a8c314384..4d83f8872 100644 --- a/source/glbinding/include/glbinding/gl33ext/functions.h +++ b/source/glbinding/include/glbinding/gl33ext/functions.h @@ -119,6 +119,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl33ext/types.h b/source/glbinding/include/glbinding/gl33ext/types.h index 54083e064..64228c922 100644 --- a/source/glbinding/include/glbinding/gl33ext/types.h +++ b/source/glbinding/include/glbinding/gl33ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl40/types.h b/source/glbinding/include/glbinding/gl40/types.h index dfcf8e7f9..6e697acf0 100644 --- a/source/glbinding/include/glbinding/gl40/types.h +++ b/source/glbinding/include/glbinding/gl40/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl40core/types.h b/source/glbinding/include/glbinding/gl40core/types.h index ee1212c46..dbc9a2c95 100644 --- a/source/glbinding/include/glbinding/gl40core/types.h +++ b/source/glbinding/include/glbinding/gl40core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl40ext/functions.h b/source/glbinding/include/glbinding/gl40ext/functions.h index 2a04e8299..36389a238 100644 --- a/source/glbinding/include/glbinding/gl40ext/functions.h +++ b/source/glbinding/include/glbinding/gl40ext/functions.h @@ -113,6 +113,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl40ext/types.h b/source/glbinding/include/glbinding/gl40ext/types.h index 254baf8aa..2b63cab06 100644 --- a/source/glbinding/include/glbinding/gl40ext/types.h +++ b/source/glbinding/include/glbinding/gl40ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl41/types.h b/source/glbinding/include/glbinding/gl41/types.h index 5d6dcaa1e..8936048a1 100644 --- a/source/glbinding/include/glbinding/gl41/types.h +++ b/source/glbinding/include/glbinding/gl41/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl41core/types.h b/source/glbinding/include/glbinding/gl41core/types.h index cdd64a7be..c1cf7007a 100644 --- a/source/glbinding/include/glbinding/gl41core/types.h +++ b/source/glbinding/include/glbinding/gl41core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl41ext/functions.h b/source/glbinding/include/glbinding/gl41ext/functions.h index 93148ef59..55396cd24 100644 --- a/source/glbinding/include/glbinding/gl41ext/functions.h +++ b/source/glbinding/include/glbinding/gl41ext/functions.h @@ -111,6 +111,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl41ext/types.h b/source/glbinding/include/glbinding/gl41ext/types.h index aeb8213dd..f69355d3e 100644 --- a/source/glbinding/include/glbinding/gl41ext/types.h +++ b/source/glbinding/include/glbinding/gl41ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl42/types.h b/source/glbinding/include/glbinding/gl42/types.h index 1930e6480..053ae8e07 100644 --- a/source/glbinding/include/glbinding/gl42/types.h +++ b/source/glbinding/include/glbinding/gl42/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl42core/types.h b/source/glbinding/include/glbinding/gl42core/types.h index c903806a6..dc9ada83b 100644 --- a/source/glbinding/include/glbinding/gl42core/types.h +++ b/source/glbinding/include/glbinding/gl42core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl42ext/functions.h b/source/glbinding/include/glbinding/gl42ext/functions.h index ac2b34e8c..87fa8799d 100644 --- a/source/glbinding/include/glbinding/gl42ext/functions.h +++ b/source/glbinding/include/glbinding/gl42ext/functions.h @@ -110,6 +110,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl42ext/types.h b/source/glbinding/include/glbinding/gl42ext/types.h index 8c72ae6fb..4d0c793a3 100644 --- a/source/glbinding/include/glbinding/gl42ext/types.h +++ b/source/glbinding/include/glbinding/gl42ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl43/types.h b/source/glbinding/include/glbinding/gl43/types.h index 18d90fcde..ec2ebdcc3 100644 --- a/source/glbinding/include/glbinding/gl43/types.h +++ b/source/glbinding/include/glbinding/gl43/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl43core/types.h b/source/glbinding/include/glbinding/gl43core/types.h index 7d0306195..3c863225c 100644 --- a/source/glbinding/include/glbinding/gl43core/types.h +++ b/source/glbinding/include/glbinding/gl43core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl43ext/functions.h b/source/glbinding/include/glbinding/gl43ext/functions.h index 3e041f538..41e741077 100644 --- a/source/glbinding/include/glbinding/gl43ext/functions.h +++ b/source/glbinding/include/glbinding/gl43ext/functions.h @@ -109,6 +109,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl43ext/types.h b/source/glbinding/include/glbinding/gl43ext/types.h index a96dde26c..c8178bf9a 100644 --- a/source/glbinding/include/glbinding/gl43ext/types.h +++ b/source/glbinding/include/glbinding/gl43ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl44/types.h b/source/glbinding/include/glbinding/gl44/types.h index a4a588edd..6e5b9b663 100644 --- a/source/glbinding/include/glbinding/gl44/types.h +++ b/source/glbinding/include/glbinding/gl44/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl44core/types.h b/source/glbinding/include/glbinding/gl44core/types.h index de5c2e0dd..f1a5c2887 100644 --- a/source/glbinding/include/glbinding/gl44core/types.h +++ b/source/glbinding/include/glbinding/gl44core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl44ext/functions.h b/source/glbinding/include/glbinding/gl44ext/functions.h index 0ad53797d..9dfb7025c 100644 --- a/source/glbinding/include/glbinding/gl44ext/functions.h +++ b/source/glbinding/include/glbinding/gl44ext/functions.h @@ -103,6 +103,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBlitNamedFramebuffer; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; diff --git a/source/glbinding/include/glbinding/gl44ext/types.h b/source/glbinding/include/glbinding/gl44ext/types.h index 19240c4c1..2b61a67ec 100644 --- a/source/glbinding/include/glbinding/gl44ext/types.h +++ b/source/glbinding/include/glbinding/gl44ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl45/types.h b/source/glbinding/include/glbinding/gl45/types.h index bfe7c6d58..63b982160 100644 --- a/source/glbinding/include/glbinding/gl45/types.h +++ b/source/glbinding/include/glbinding/gl45/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl45core/types.h b/source/glbinding/include/glbinding/gl45core/types.h index 7fae6497a..a66a4e364 100644 --- a/source/glbinding/include/glbinding/gl45core/types.h +++ b/source/glbinding/include/glbinding/gl45core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl45ext/functions.h b/source/glbinding/include/glbinding/gl45ext/functions.h index 856054226..295875058 100644 --- a/source/glbinding/include/glbinding/gl45ext/functions.h +++ b/source/glbinding/include/glbinding/gl45ext/functions.h @@ -102,6 +102,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; using gl::glBufferDataARB; diff --git a/source/glbinding/include/glbinding/gl45ext/types.h b/source/glbinding/include/glbinding/gl45ext/types.h index 917ec1872..06d26ecec 100644 --- a/source/glbinding/include/glbinding/gl45ext/types.h +++ b/source/glbinding/include/glbinding/gl45ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl46/types.h b/source/glbinding/include/glbinding/gl46/types.h index c27777439..f3eaa469d 100644 --- a/source/glbinding/include/glbinding/gl46/types.h +++ b/source/glbinding/include/glbinding/gl46/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl46core/types.h b/source/glbinding/include/glbinding/gl46core/types.h index ee50985e8..65fb65171 100644 --- a/source/glbinding/include/glbinding/gl46core/types.h +++ b/source/glbinding/include/glbinding/gl46core/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/gl46ext/functions.h b/source/glbinding/include/glbinding/gl46ext/functions.h index 1db504553..5dda06c0b 100644 --- a/source/glbinding/include/glbinding/gl46ext/functions.h +++ b/source/glbinding/include/glbinding/gl46ext/functions.h @@ -102,6 +102,8 @@ using gl::glBlendFuncSeparateIndexedAMD; using gl::glBlendFuncSeparateINGR; using gl::glBlendParameteriNV; using gl::glBlitFramebufferEXT; +using gl::glBlitFramebufferLayerEXT; +using gl::glBlitFramebufferLayersEXT; using gl::glBufferAddressRangeNV; using gl::glBufferAttachMemoryNV; using gl::glBufferDataARB; diff --git a/source/glbinding/include/glbinding/gl46ext/types.h b/source/glbinding/include/glbinding/gl46ext/types.h index 10fb41bd8..e1c9cc6a5 100644 --- a/source/glbinding/include/glbinding/gl46ext/types.h +++ b/source/glbinding/include/glbinding/gl46ext/types.h @@ -69,7 +69,6 @@ using gl::MemoryBarrierMask; using gl::OcclusionQueryEventMaskAMD; using gl::PathFontStyle; using gl::PathMetricMask; -using gl::PathRenderingMaskNV; using gl::PerformanceQueryCapsMaskINTEL; using gl::SyncObjectMask; using gl::TextureStorageMaskAMD; diff --git a/source/glbinding/include/glbinding/glbinding.h b/source/glbinding/include/glbinding/glbinding.h index d2a224fe9..76ece42f1 100644 --- a/source/glbinding/include/glbinding/glbinding.h +++ b/source/glbinding/include/glbinding/glbinding.h @@ -57,7 +57,6 @@ using ContextSwitchCallback = std::function; // * * glxGetProcAddress * * glfwGetProcAddress * * QOpenGlContext::getProcAddress -* * reinterpret_cast(SDL_GL_GetProcAddress) */ GLBINDING_API void initialize(glbinding::GetProcAddress functionPointerResolver, bool resolveFunctions = true); diff --git a/source/glbinding/source/Binding_list.cpp b/source/glbinding/source/Binding_list.cpp index 9ec4518f6..eb64a7330 100644 --- a/source/glbinding/source/Binding_list.cpp +++ b/source/glbinding/source/Binding_list.cpp @@ -148,6 +148,8 @@ const Binding::array_t Binding::s_functions = &BlendParameteriNV, &BlitFramebuffer, &BlitFramebufferEXT, + &BlitFramebufferLayerEXT, + &BlitFramebufferLayersEXT, &BlitNamedFramebuffer, &BufferAddressRangeNV, &BufferAttachMemoryNV, diff --git a/source/glbinding/source/Binding_objects_b.cpp b/source/glbinding/source/Binding_objects_b.cpp index 3a265fa35..a6bf75c32 100644 --- a/source/glbinding/source/Binding_objects_b.cpp +++ b/source/glbinding/source/Binding_objects_b.cpp @@ -117,6 +117,8 @@ Function Binding::BlendFuncSeparateINGR("g Function Binding::BlendParameteriNV("glBlendParameteriNV"); Function Binding::BlitFramebuffer("glBlitFramebuffer"); Function Binding::BlitFramebufferEXT("glBlitFramebufferEXT"); +Function Binding::BlitFramebufferLayerEXT("glBlitFramebufferLayerEXT"); +Function Binding::BlitFramebufferLayersEXT("glBlitFramebufferLayersEXT"); Function Binding::BlitNamedFramebuffer("glBlitNamedFramebuffer"); Function Binding::BufferAddressRangeNV("glBufferAddressRangeNV"); Function Binding::BufferAttachMemoryNV("glBufferAttachMemoryNV"); diff --git a/source/glbinding/source/gl/functions_b.cpp b/source/glbinding/source/gl/functions_b.cpp index c6fb11e36..c5029309a 100644 --- a/source/glbinding/source/gl/functions_b.cpp +++ b/source/glbinding/source/gl/functions_b.cpp @@ -548,6 +548,16 @@ void glBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GL return glbinding::Binding::BlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } +void glBlitFramebufferLayerEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, ClearBufferMask mask, GLenum filter) +{ + return glbinding::Binding::BlitFramebufferLayerEXT(srcX0, srcY0, srcX1, srcY1, srcLayer, dstX0, dstY0, dstX1, dstY1, dstLayer, mask, filter); +} + +void glBlitFramebufferLayersEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter) +{ + return glbinding::Binding::BlitFramebufferLayersEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); +} + void glBlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, ClearBufferMask mask, GLenum filter) { return glbinding::Binding::BlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);