Skip to content

Commit aca55c4

Browse files
scheibelscheibel
committed
Update gl.xml
1 parent 6fc8f59 commit aca55c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+145
-264
lines changed

‎source/glbinding-aux/include/glbinding-aux/Meta.h

-12
Original file line numberDiff line numberDiff line change
@@ -432,18 +432,6 @@ class GLBINDING_AUX_API Meta
432432
*/
433433
static const std::string & getString(gl::PathMetricMask glbitfield);
434434

435-
/**
436-
* @brief
437-
* Convert bitfield to symbol name string representation
438-
*
439-
* @param[in] bitfield
440-
* The bitfield value
441-
*
442-
* @return
443-
* The string representation of the value
444-
*/
445-
static const std::string & getString(gl::PathRenderingMaskNV glbitfield);
446-
447435
/**
448436
* @brief
449437
* Convert bitfield to symbol name string representation

‎source/glbinding-aux/include/glbinding-aux/types_to_string.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const MemoryB
3434
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const OcclusionQueryEventMaskAMD & value);
3535
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathFontStyle & value);
3636
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathMetricMask & value);
37-
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PathRenderingMaskNV & value);
3837
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const PerformanceQueryCapsMaskINTEL & value);
3938
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const SyncObjectMask & value);
4039
GLBINDING_AUX_API std::ostream & operator<<(std::ostream & stream, const TextureStorageMaskAMD & value);

‎source/glbinding-aux/source/Meta_ExtensionsByFunctionString.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ const std::unordered_map<std::string, std::set<GLextension>> Meta_ExtensionsByFu
132132
{ "glBlendParameteriNV", { GLextension::GL_NV_blend_equation_advanced } },
133133
{ "glBlitFramebuffer", { GLextension::GL_ARB_framebuffer_object } },
134134
{ "glBlitFramebufferEXT", { GLextension::GL_EXT_framebuffer_blit } },
135+
{ "glBlitFramebufferLayerEXT", { GLextension::GL_EXT_framebuffer_blit_layers } },
136+
{ "glBlitFramebufferLayersEXT", { GLextension::GL_EXT_framebuffer_blit_layers } },
135137
{ "glBlitNamedFramebuffer", { GLextension::GL_ARB_direct_state_access } },
136138
{ "glBufferAddressRangeNV", { GLextension::GL_NV_vertex_buffer_unified_memory } },
137139
{ "glBufferAttachMemoryNV", { GLextension::GL_NV_memory_attachment } },

‎source/glbinding-aux/source/Meta_ExtensionsByString.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ const std::unordered_map<std::string, GLextension> Meta_ExtensionsByString_E =
299299
{ "GL_EXT_external_buffer", GLextension::GL_EXT_external_buffer },
300300
{ "GL_EXT_fog_coord", GLextension::GL_EXT_fog_coord },
301301
{ "GL_EXT_framebuffer_blit", GLextension::GL_EXT_framebuffer_blit },
302+
{ "GL_EXT_framebuffer_blit_layers", GLextension::GL_EXT_framebuffer_blit_layers },
302303
{ "GL_EXT_framebuffer_multisample", GLextension::GL_EXT_framebuffer_multisample },
303304
{ "GL_EXT_framebuffer_multisample_blit_scaled", GLextension::GL_EXT_framebuffer_multisample_blit_scaled },
304305
{ "GL_EXT_framebuffer_object", GLextension::GL_EXT_framebuffer_object },
@@ -572,6 +573,7 @@ const std::unordered_map<std::string, GLextension> Meta_ExtensionsByString_N =
572573
{ "GL_NV_timeline_semaphore", GLextension::GL_NV_timeline_semaphore },
573574
{ "GL_NV_transform_feedback", GLextension::GL_NV_transform_feedback },
574575
{ "GL_NV_transform_feedback2", GLextension::GL_NV_transform_feedback2 },
576+
{ "GL_NV_uniform_buffer_std430_layout", GLextension::GL_NV_uniform_buffer_std430_layout },
575577
{ "GL_NV_uniform_buffer_unified_memory", GLextension::GL_NV_uniform_buffer_unified_memory },
576578
{ "GL_NV_vdpau_interop", GLextension::GL_NV_vdpau_interop },
577579
{ "GL_NV_vdpau_interop2", GLextension::GL_NV_vdpau_interop2 },

‎source/glbinding-aux/source/Meta_FunctionStringsByExtension.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ const std::unordered_map<GLextension, std::set<std::string>> Meta_FunctionString
157157
{ GLextension::GL_EXT_external_buffer, { "glBufferStorageExternalEXT", "glNamedBufferStorageExternalEXT" } },
158158
{ GLextension::GL_EXT_fog_coord, { "glFogCoorddEXT", "glFogCoorddvEXT", "glFogCoordfEXT", "glFogCoordfvEXT", "glFogCoordPointerEXT" } },
159159
{ GLextension::GL_EXT_framebuffer_blit, { "glBlitFramebufferEXT" } },
160+
{ GLextension::GL_EXT_framebuffer_blit_layers, { "glBlitFramebufferLayerEXT", "glBlitFramebufferLayersEXT" } },
160161
{ GLextension::GL_EXT_framebuffer_multisample, { "glRenderbufferStorageMultisampleEXT" } },
161162
{ GLextension::GL_EXT_framebuffer_object, { "glBindFramebufferEXT", "glBindRenderbufferEXT", "glCheckFramebufferStatusEXT", "glDeleteFramebuffersEXT", "glDeleteRenderbuffersEXT", "glFramebufferRenderbufferEXT", "glFramebufferTexture1DEXT", "glFramebufferTexture2DEXT", "glFramebufferTexture3DEXT", "glGenerateMipmapEXT", "glGenFramebuffersEXT", "glGenRenderbuffersEXT", "glGetFramebufferAttachmentParameterivEXT", "glGetRenderbufferParameterivEXT", "glIsFramebufferEXT", "glIsRenderbufferEXT", "glRenderbufferStorageEXT" } },
162163
{ GLextension::GL_EXT_geometry_shader4, { "glProgramParameteriEXT" } },

‎source/glbinding-aux/source/Meta_Maps.h

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ extern const std::unordered_map<gl::MemoryBarrierMask, std::string> Meta_Strings
4848
extern const std::unordered_map<gl::OcclusionQueryEventMaskAMD, std::string> Meta_StringsByOcclusionQueryEventMaskAMD;
4949
extern const std::unordered_map<gl::PathFontStyle, std::string> Meta_StringsByPathFontStyle;
5050
extern const std::unordered_map<gl::PathMetricMask, std::string> Meta_StringsByPathMetricMask;
51-
extern const std::unordered_map<gl::PathRenderingMaskNV, std::string> Meta_StringsByPathRenderingMaskNV;
5251
extern const std::unordered_map<gl::PerformanceQueryCapsMaskINTEL, std::string> Meta_StringsByPerformanceQueryCapsMaskINTEL;
5352
extern const std::unordered_map<gl::SyncObjectMask, std::string> Meta_StringsBySyncObjectMask;
5453
extern const std::unordered_map<gl::TextureStorageMaskAMD, std::string> Meta_StringsByTextureStorageMaskAMD;

‎source/glbinding-aux/source/Meta_StringsByBitfield.cpp

-30
Original file line numberDiff line numberDiff line change
@@ -220,36 +220,6 @@ const std::unordered_map<PathMetricMask, std::string> Meta_StringsByPathMetricMa
220220
{ PathMetricMask::GL_NONE_BIT, "GL_NONE_BIT" }
221221
};
222222

223-
const std::unordered_map<PathRenderingMaskNV, std::string> Meta_StringsByPathRenderingMaskNV =
224-
{
225-
{ PathRenderingMaskNV::GL_BOLD_BIT_NV, "GL_BOLD_BIT_NV" },
226-
{ PathRenderingMaskNV::GL_FONT_ASCENDER_BIT_NV, "GL_FONT_ASCENDER_BIT_NV" },
227-
{ PathRenderingMaskNV::GL_FONT_DESCENDER_BIT_NV, "GL_FONT_DESCENDER_BIT_NV" },
228-
{ PathRenderingMaskNV::GL_FONT_HAS_KERNING_BIT_NV, "GL_FONT_HAS_KERNING_BIT_NV" },
229-
{ PathRenderingMaskNV::GL_FONT_HEIGHT_BIT_NV, "GL_FONT_HEIGHT_BIT_NV" },
230-
{ PathRenderingMaskNV::GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV, "GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV" },
231-
{ PathRenderingMaskNV::GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV, "GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV" },
232-
{ PathRenderingMaskNV::GL_FONT_NUM_GLYPH_INDICES_BIT_NV, "GL_FONT_NUM_GLYPH_INDICES_BIT_NV" },
233-
{ PathRenderingMaskNV::GL_FONT_UNDERLINE_POSITION_BIT_NV, "GL_FONT_UNDERLINE_POSITION_BIT_NV" },
234-
{ PathRenderingMaskNV::GL_FONT_UNDERLINE_THICKNESS_BIT_NV, "GL_FONT_UNDERLINE_THICKNESS_BIT_NV" },
235-
{ PathRenderingMaskNV::GL_FONT_UNITS_PER_EM_BIT_NV, "GL_FONT_UNITS_PER_EM_BIT_NV" },
236-
{ PathRenderingMaskNV::GL_FONT_X_MAX_BOUNDS_BIT_NV, "GL_FONT_X_MAX_BOUNDS_BIT_NV" },
237-
{ PathRenderingMaskNV::GL_FONT_X_MIN_BOUNDS_BIT_NV, "GL_FONT_X_MIN_BOUNDS_BIT_NV" },
238-
{ PathRenderingMaskNV::GL_FONT_Y_MAX_BOUNDS_BIT_NV, "GL_FONT_Y_MAX_BOUNDS_BIT_NV" },
239-
{ PathRenderingMaskNV::GL_FONT_Y_MIN_BOUNDS_BIT_NV, "GL_FONT_Y_MIN_BOUNDS_BIT_NV" },
240-
{ PathRenderingMaskNV::GL_GLYPH_HAS_KERNING_BIT_NV, "GL_GLYPH_HAS_KERNING_BIT_NV" },
241-
{ PathRenderingMaskNV::GL_GLYPH_HEIGHT_BIT_NV, "GL_GLYPH_HEIGHT_BIT_NV" },
242-
{ PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV" },
243-
{ PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV" },
244-
{ PathRenderingMaskNV::GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV, "GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV" },
245-
{ PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV" },
246-
{ PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_X_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_X_BIT_NV" },
247-
{ PathRenderingMaskNV::GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV, "GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV" },
248-
{ PathRenderingMaskNV::GL_GLYPH_WIDTH_BIT_NV, "GL_GLYPH_WIDTH_BIT_NV" },
249-
{ PathRenderingMaskNV::GL_ITALIC_BIT_NV, "GL_ITALIC_BIT_NV" },
250-
{ PathRenderingMaskNV::GL_NONE_BIT, "GL_NONE_BIT" }
251-
};
252-
253223
const std::unordered_map<PerformanceQueryCapsMaskINTEL, std::string> Meta_StringsByPerformanceQueryCapsMaskINTEL =
254224
{
255225
{ PerformanceQueryCapsMaskINTEL::GL_NONE_BIT, "GL_NONE_BIT" },

‎source/glbinding-aux/source/Meta_StringsByExtension.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ const std::unordered_map<GLextension, std::string> Meta_StringsByExtension =
285285
{ GLextension::GL_EXT_external_buffer, "GL_EXT_external_buffer" },
286286
{ GLextension::GL_EXT_fog_coord, "GL_EXT_fog_coord" },
287287
{ GLextension::GL_EXT_framebuffer_blit, "GL_EXT_framebuffer_blit" },
288+
{ GLextension::GL_EXT_framebuffer_blit_layers, "GL_EXT_framebuffer_blit_layers" },
288289
{ GLextension::GL_EXT_framebuffer_multisample, "GL_EXT_framebuffer_multisample" },
289290
{ GLextension::GL_EXT_framebuffer_multisample_blit_scaled, "GL_EXT_framebuffer_multisample_blit_scaled" },
290291
{ GLextension::GL_EXT_framebuffer_object, "GL_EXT_framebuffer_object" },
@@ -528,6 +529,7 @@ const std::unordered_map<GLextension, std::string> Meta_StringsByExtension =
528529
{ GLextension::GL_NV_timeline_semaphore, "GL_NV_timeline_semaphore" },
529530
{ GLextension::GL_NV_transform_feedback, "GL_NV_transform_feedback" },
530531
{ GLextension::GL_NV_transform_feedback2, "GL_NV_transform_feedback2" },
532+
{ GLextension::GL_NV_uniform_buffer_std430_layout, "GL_NV_uniform_buffer_std430_layout" },
531533
{ GLextension::GL_NV_uniform_buffer_unified_memory, "GL_NV_uniform_buffer_unified_memory" },
532534
{ GLextension::GL_NV_vdpau_interop, "GL_NV_vdpau_interop" },
533535
{ GLextension::GL_NV_vdpau_interop2, "GL_NV_vdpau_interop2" },

‎source/glbinding-aux/source/Meta_getStringByBitfield.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,6 @@ const std::string & Meta::getString(const PathMetricMask glbitfield)
173173
return none;
174174
}
175175

176-
const std::string & Meta::getString(const PathRenderingMaskNV glbitfield)
177-
{
178-
const auto i = Meta_StringsByPathRenderingMaskNV.find(glbitfield);
179-
if (i != Meta_StringsByPathRenderingMaskNV.end())
180-
{
181-
return i->second;
182-
}
183-
return none;
184-
}
185-
186176
const std::string & Meta::getString(const PerformanceQueryCapsMaskINTEL glbitfield)
187177
{
188178
const auto i = Meta_StringsByPerformanceQueryCapsMaskINTEL.find(glbitfield);

‎source/glbinding-aux/source/glrevision.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace glbinding
66
{
77

88

9-
const unsigned int GL_REVISION = 20230211; ///< The revision of the gl.xml at the time of code generation.
9+
const unsigned int GL_REVISION = 20240227; ///< The revision of the gl.xml at the time of code generation.
1010

1111

1212
} // namespace glbinding

‎source/glbinding-aux/source/types_to_string.cpp

-18
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,6 @@ std::ostream & operator<<(std::ostream & stream, const PathMetricMask & value)
136136
return stream;
137137
}
138138

139-
std::ostream & operator<<(std::ostream & stream, const PathRenderingMaskNV & value)
140-
{
141-
stream << glbinding::aux::bitfieldString<PathRenderingMaskNV>(value);
142-
return stream;
143-
}
144-
145139
std::ostream & operator<<(std::ostream & stream, const PerformanceQueryCapsMaskINTEL & value)
146140
{
147141
stream << glbinding::aux::bitfieldString<PerformanceQueryCapsMaskINTEL>(value);
@@ -542,18 +536,6 @@ if (typeid(*value) == typeid(Value<const char *>))
542536
}
543537

544538

545-
if (typeid(*value) == typeid(Value<gl::PathRenderingMaskNV>))
546-
{
547-
return stream << *reinterpret_cast<const Value<gl::PathRenderingMaskNV>*>(value);
548-
}
549-
550-
551-
if (typeid(*value) == typeid(Value<gl::PathRenderingMaskNV *>))
552-
{
553-
return stream << *reinterpret_cast<const Value<gl::PathRenderingMaskNV *>*>(value);
554-
}
555-
556-
557539
if (typeid(*value) == typeid(Value<gl::PerformanceQueryCapsMaskINTEL>))
558540
{
559541
return stream << *reinterpret_cast<const Value<gl::PerformanceQueryCapsMaskINTEL>*>(value);

‎source/glbinding/include/glbinding/Binding.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class GLBINDING_API Binding
6464

6565
using ContextSwitchCallback = std::function<void(ContextHandle)>; ///< The signature of the context switch callback
6666

67-
using array_t = std::array<AbstractFunction *, 3002>; ///< The type of the build-in functions collection
67+
using array_t = std::array<AbstractFunction *, 3004>; ///< The type of the build-in functions collection
6868

6969

7070
public:
@@ -98,7 +98,6 @@ class GLBINDING_API Binding
9898
* * glxGetProcAddress
9999
* * glfwGetProcAddress
100100
* * QOpenGlContext::getProcAddress
101-
* * reinterpret_cast<glbinding::ProcAddress(*)(const char*)>(SDL_GL_GetProcAddress)
102101
*/
103102
static void initialize(glbinding::GetProcAddress functionPointerResolver, bool resolveFunctions = true);
104103

@@ -583,6 +582,8 @@ class GLBINDING_API Binding
583582
static Function<void, gl::GLenum, gl::GLint> BlendParameteriNV; ///< Wrapper for glBlendParameteriNV
584583
static Function<void, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::ClearBufferMask, gl::GLenum> BlitFramebuffer; ///< Wrapper for glBlitFramebuffer
585584
static Function<void, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::ClearBufferMask, gl::GLenum> BlitFramebufferEXT; ///< Wrapper for glBlitFramebufferEXT
585+
static Function<void, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::ClearBufferMask, gl::GLenum> BlitFramebufferLayerEXT; ///< Wrapper for glBlitFramebufferLayerEXT
586+
static Function<void, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::ClearBufferMask, gl::GLenum> BlitFramebufferLayersEXT; ///< Wrapper for glBlitFramebufferLayersEXT
586587
static Function<void, gl::GLuint, gl::GLuint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::GLint, gl::ClearBufferMask, gl::GLenum> BlitNamedFramebuffer; ///< Wrapper for glBlitNamedFramebuffer
587588
static Function<void, gl::GLenum, gl::GLuint, gl::GLuint64EXT, gl::GLsizeiptr> BufferAddressRangeNV; ///< Wrapper for glBufferAddressRangeNV
588589
static Function<void, gl::GLenum, gl::GLuint, gl::GLuint64> BufferAttachMemoryNV; ///< Wrapper for glBufferAttachMemoryNV

0 commit comments

Comments
 (0)