Skip to content

Commit

Permalink
Update gl.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
scheibel committed Feb 27, 2024
1 parent 6fc8f59 commit aca55c4
Show file tree
Hide file tree
Showing 88 changed files with 145 additions and 264 deletions.
12 changes: 0 additions & 12 deletions source/glbinding-aux/include/glbinding-aux/Meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ const std::unordered_map<std::string, std::set<GLextension>> 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 } },
Expand Down
2 changes: 2 additions & 0 deletions source/glbinding-aux/source/Meta_ExtensionsByString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ const std::unordered_map<std::string, GLextension> 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 },
Expand Down Expand Up @@ -572,6 +573,7 @@ const std::unordered_map<std::string, GLextension> 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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ const std::unordered_map<GLextension, std::set<std::string>> 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" } },
Expand Down
1 change: 0 additions & 1 deletion source/glbinding-aux/source/Meta_Maps.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ extern const std::unordered_map<gl::MemoryBarrierMask, std::string> Meta_Strings
extern const std::unordered_map<gl::OcclusionQueryEventMaskAMD, std::string> Meta_StringsByOcclusionQueryEventMaskAMD;
extern const std::unordered_map<gl::PathFontStyle, std::string> Meta_StringsByPathFontStyle;
extern const std::unordered_map<gl::PathMetricMask, std::string> Meta_StringsByPathMetricMask;
extern const std::unordered_map<gl::PathRenderingMaskNV, std::string> Meta_StringsByPathRenderingMaskNV;
extern const std::unordered_map<gl::PerformanceQueryCapsMaskINTEL, std::string> Meta_StringsByPerformanceQueryCapsMaskINTEL;
extern const std::unordered_map<gl::SyncObjectMask, std::string> Meta_StringsBySyncObjectMask;
extern const std::unordered_map<gl::TextureStorageMaskAMD, std::string> Meta_StringsByTextureStorageMaskAMD;
Expand Down
30 changes: 0 additions & 30 deletions source/glbinding-aux/source/Meta_StringsByBitfield.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,36 +220,6 @@ const std::unordered_map<PathMetricMask, std::string> Meta_StringsByPathMetricMa
{ PathMetricMask::GL_NONE_BIT, "GL_NONE_BIT" }
};

const std::unordered_map<PathRenderingMaskNV, std::string> 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<PerformanceQueryCapsMaskINTEL, std::string> Meta_StringsByPerformanceQueryCapsMaskINTEL =
{
{ PerformanceQueryCapsMaskINTEL::GL_NONE_BIT, "GL_NONE_BIT" },
Expand Down
2 changes: 2 additions & 0 deletions source/glbinding-aux/source/Meta_StringsByExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ const std::unordered_map<GLextension, std::string> 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" },
Expand Down Expand Up @@ -528,6 +529,7 @@ const std::unordered_map<GLextension, std::string> 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" },
Expand Down
10 changes: 0 additions & 10 deletions source/glbinding-aux/source/Meta_getStringByBitfield.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion source/glbinding-aux/source/glrevision.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 0 additions & 18 deletions source/glbinding-aux/source/types_to_string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathRenderingMaskNV>(value);
return stream;
}

std::ostream & operator<<(std::ostream & stream, const PerformanceQueryCapsMaskINTEL & value)
{
stream << glbinding::aux::bitfieldString<PerformanceQueryCapsMaskINTEL>(value);
Expand Down Expand Up @@ -542,18 +536,6 @@ if (typeid(*value) == typeid(Value<const char *>))
}


if (typeid(*value) == typeid(Value<gl::PathRenderingMaskNV>))
{
return stream << *reinterpret_cast<const Value<gl::PathRenderingMaskNV>*>(value);
}


if (typeid(*value) == typeid(Value<gl::PathRenderingMaskNV *>))
{
return stream << *reinterpret_cast<const Value<gl::PathRenderingMaskNV *>*>(value);
}


if (typeid(*value) == typeid(Value<gl::PerformanceQueryCapsMaskINTEL>))
{
return stream << *reinterpret_cast<const Value<gl::PerformanceQueryCapsMaskINTEL>*>(value);
Expand Down
5 changes: 3 additions & 2 deletions source/glbinding/include/glbinding/Binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class GLBINDING_API Binding

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

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


public:
Expand Down Expand Up @@ -98,7 +98,6 @@ class GLBINDING_API Binding
* * glxGetProcAddress
* * glfwGetProcAddress
* * QOpenGlContext::getProcAddress
* * reinterpret_cast<glbinding::ProcAddress(*)(const char*)>(SDL_GL_GetProcAddress)
*/
static void initialize(glbinding::GetProcAddress functionPointerResolver, bool resolveFunctions = true);

Expand Down Expand Up @@ -583,6 +582,8 @@ class GLBINDING_API Binding
static Function<void, gl::GLenum, gl::GLint> BlendParameteriNV; ///< Wrapper for glBlendParameteriNV
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
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
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
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
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
static Function<void, gl::GLenum, gl::GLuint, gl::GLuint64EXT, gl::GLsizeiptr> BufferAddressRangeNV; ///< Wrapper for glBufferAddressRangeNV
static Function<void, gl::GLenum, gl::GLuint, gl::GLuint64> BufferAttachMemoryNV; ///< Wrapper for glBufferAttachMemoryNV
Expand Down
Loading

0 comments on commit aca55c4

Please sign in to comment.