LibWeb/WebGL: Remove Extensions interface

No other third layer folder in LibWeb has its own namespace which
makes this a special case for the IDLGenerator when determining
namespaces. Instead of adding a special case, simply remove the
namespace.
This commit is contained in:
Shannon Booth
2026-04-22 15:33:59 +02:00
committed by Shannon Booth
parent 83427086fa
commit 4178ec0af4
Notes: github-actions[bot] 2026-04-24 18:10:10 +00:00
31 changed files with 41 additions and 47 deletions

View File

@@ -1353,11 +1353,6 @@ class WebGLTexture;
class WebGLTransformFeedback;
class WebGLUniformLocation;
class WebGLVertexArrayObject;
}
namespace Web::WebGL::Extensions {
class ANGLEInstancedArrays;
class EXTBlendMinMax;
class EXTColorBufferFloat;

View File

@@ -15,7 +15,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(ANGLEInstancedArrays);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/Forward.h>
#include <LibWeb/WebGL/Types.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class ANGLEInstancedArrays : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(ANGLEInstancedArrays, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(EXTBlendMinMax);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class EXTBlendMinMax : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(EXTBlendMinMax, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(EXTColorBufferFloat);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class EXTColorBufferFloat : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(EXTColorBufferFloat, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(EXTRenderSnorm);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class EXTRenderSnorm : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(EXTRenderSnorm, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(EXTTextureFilterAnisotropic);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class EXTTextureFilterAnisotropic : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(EXTTextureFilterAnisotropic, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(EXTTextureNorm16);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class EXTTextureNorm16 : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(EXTTextureNorm16, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(OESElementIndexUint);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class OESElementIndexUint : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(OESElementIndexUint, Bindings::PlatformObject);

View File

@@ -11,7 +11,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(OESStandardDerivatives);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class OESStandardDerivatives : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(OESStandardDerivatives, Bindings::PlatformObject);

View File

@@ -16,7 +16,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(OESVertexArrayObject);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/Forward.h>
#include <LibWeb/WebGL/Types.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class OESVertexArrayObject : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(OESVertexArrayObject, Bindings::PlatformObject);

View File

@@ -14,7 +14,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(WebGLCompressedTextureS3tc);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class WebGLCompressedTextureS3tc : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(WebGLCompressedTextureS3tc, Bindings::PlatformObject);

View File

@@ -14,7 +14,7 @@
#include <LibWeb/WebGL/OpenGLContext.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(WebGLCompressedTextureS3tcSrgb);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class WebGLCompressedTextureS3tcSrgb : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(WebGLCompressedTextureS3tcSrgb, Bindings::PlatformObject);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/WebGL/Extensions/WebGLDebugRendererInfo.h>
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(WebGLDebugRendererInfo);

View File

@@ -9,7 +9,7 @@
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Forward.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class WebGLDebugRendererInfo : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(WebGLDebugRendererInfo, Bindings::PlatformObject);

View File

@@ -15,7 +15,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(WebGLDrawBuffers);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/Forward.h>
#include <LibWeb/WebGL/Types.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class WebGLDrawBuffers : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(WebGLDrawBuffers, Bindings::PlatformObject);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/Bindings/WebGLVertexArrayObjectOES.h>
#include <LibWeb/WebGL/Extensions/WebGLVertexArrayObjectOES.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
GC_DEFINE_ALLOCATOR(WebGLVertexArrayObjectOES);

View File

@@ -10,7 +10,7 @@
#include <LibWeb/WebGL/Types.h>
#include <LibWeb/WebGL/WebGLObject.h>
namespace Web::WebGL::Extensions {
namespace Web::WebGL {
class WebGLVertexArrayObjectOES : public WebGLObject {
WEB_PLATFORM_OBJECT(WebGLVertexArrayObjectOES, WebGLObject);

View File

@@ -112,28 +112,28 @@ struct Extension {
static HashMap<String, Extension, AK::ASCIICaseInsensitiveStringTraits> s_available_webgl_extensions {
// Khronos ratified WebGL Extensions
{ "ANGLE_instanced_arrays"_string, { { "GL_ANGLE_instanced_arrays"sv }, Extensions::ANGLEInstancedArrays::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_blend_minmax"_string, { { "GL_EXT_blend_minmax"sv }, Extensions::EXTBlendMinMax::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "ANGLE_instanced_arrays"_string, { { "GL_ANGLE_instanced_arrays"sv }, ANGLEInstancedArrays::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_blend_minmax"_string, { { "GL_EXT_blend_minmax"sv }, EXTBlendMinMax::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_frag_depth"_string, { { "GL_EXT_frag_depth"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_shader_texture_lod"_string, { { "GL_EXT_shader_texture_lod"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_texture_filter_anisotropic"_string, { { "GL_EXT_texture_filter_anisotropic"sv }, Extensions::EXTTextureFilterAnisotropic::create } },
{ "OES_element_index_uint"_string, { { "GL_OES_element_index_uint"sv }, Extensions::OESElementIndexUint::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_standard_derivatives"_string, { { "GL_OES_standard_derivatives"sv }, Extensions::OESStandardDerivatives::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_texture_filter_anisotropic"_string, { { "GL_EXT_texture_filter_anisotropic"sv }, EXTTextureFilterAnisotropic::create } },
{ "OES_element_index_uint"_string, { { "GL_OES_element_index_uint"sv }, OESElementIndexUint::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_standard_derivatives"_string, { { "GL_OES_standard_derivatives"sv }, OESStandardDerivatives::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_texture_float"_string, { { "GL_OES_texture_float"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_texture_float_linear"_string, { { "GL_OES_texture_float_linear"sv }, nullptr } },
{ "OES_texture_half_float"_string, { { "GL_OES_texture_half_float"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_texture_half_float_linear"_string, { { "GL_OES_texture_half_float_linear"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "OES_vertex_array_object"_string, { { "GL_OES_vertex_array_object"sv }, Extensions::OESVertexArrayObject::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "WEBGL_compressed_texture_s3tc"_string, { { "GL_EXT_texture_compression_dxt1"sv, "GL_ANGLE_texture_compression_dxt3"sv, "GL_ANGLE_texture_compression_dxt5"sv }, Extensions::WebGLCompressedTextureS3tc::create } },
{ "WEBGL_debug_renderer_info"_string, { {}, Extensions::WebGLDebugRendererInfo::create } },
{ "OES_vertex_array_object"_string, { { "GL_OES_vertex_array_object"sv }, OESVertexArrayObject::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "WEBGL_compressed_texture_s3tc"_string, { { "GL_EXT_texture_compression_dxt1"sv, "GL_ANGLE_texture_compression_dxt3"sv, "GL_ANGLE_texture_compression_dxt5"sv }, WebGLCompressedTextureS3tc::create } },
{ "WEBGL_debug_renderer_info"_string, { {}, WebGLDebugRendererInfo::create } },
{ "WEBGL_debug_shaders"_string, { {}, nullptr } },
{ "WEBGL_depth_texture"_string, { { "GL_ANGLE_depth_texture"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "WEBGL_draw_buffers"_string, { { "GL_EXT_draw_buffers"sv }, Extensions::WebGLDrawBuffers::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "WEBGL_draw_buffers"_string, { { "GL_EXT_draw_buffers"sv }, WebGLDrawBuffers::create, OpenGLContext::WebGLVersion::WebGL1 } },
{ "WEBGL_lose_context"_string, { {}, nullptr } },
// Community approved WebGL Extensions
{ "EXT_clip_control"_string, { { "GL_EXT_clip_control"sv }, nullptr } },
{ "EXT_color_buffer_float"_string, { { "GL_EXT_color_buffer_float"sv }, Extensions::EXTColorBufferFloat::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_color_buffer_float"_string, { { "GL_EXT_color_buffer_float"sv }, EXTColorBufferFloat::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_color_buffer_half_float"_string, { { "GL_EXT_color_buffer_half_float"sv }, nullptr } },
{ "EXT_conservative_depth"_string, { { "GL_EXT_conservative_depth"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_depth_clamp"_string, { { "GL_EXT_depth_clamp"sv }, nullptr } },
@@ -141,12 +141,12 @@ static HashMap<String, Extension, AK::ASCIICaseInsensitiveStringTraits> s_availa
{ "EXT_disjoint_timer_query_webgl2"_string, { { "GL_EXT_disjoint_timer_query"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_float_blend"_string, { { "GL_EXT_float_blend"sv }, nullptr } },
{ "EXT_polygon_offset_clamp"_string, { { "GL_EXT_polygon_offset_clamp"sv }, nullptr } },
{ "EXT_render_snorm"_string, { { "GL_EXT_render_snorm"sv }, Extensions::EXTRenderSnorm::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_render_snorm"_string, { { "GL_EXT_render_snorm"sv }, EXTRenderSnorm::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_sRGB"_string, { { "GL_EXT_sRGB"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL1 } },
{ "EXT_texture_compression_bptc"_string, { { "GL_EXT_texture_compression_bptc"sv }, nullptr } },
{ "EXT_texture_compression_rgtc"_string, { { "GL_EXT_texture_compression_rgtc"sv }, nullptr } },
{ "EXT_texture_mirror_clamp_to_edge"_string, { { "GL_EXT_texture_mirror_clamp_to_edge"sv }, nullptr } },
{ "EXT_texture_norm16"_string, { { "GL_EXT_texture_norm16"sv }, Extensions::EXTTextureNorm16::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "EXT_texture_norm16"_string, { { "GL_EXT_texture_norm16"sv }, EXTTextureNorm16::create, OpenGLContext::WebGLVersion::WebGL2 } },
{ "KHR_parallel_shader_compile"_string, { { "GL_KHR_parallel_shader_compile"sv }, nullptr } },
{ "NV_shader_noperspective_interpolation"_string, { { "GL_NV_shader_noperspective_interpolation"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL2 } },
{ "OES_draw_buffers_indexed"_string, { { "GL_OES_draw_buffers_indexed"sv }, nullptr } },
@@ -161,7 +161,7 @@ static HashMap<String, Extension, AK::ASCIICaseInsensitiveStringTraits> s_availa
{ "WEBGL_compressed_texture_etc"_string, { { "GL_ANGLE_compressed_texture_etc"sv }, nullptr } },
{ "WEBGL_compressed_texture_etc1"_string, { { "GL_OES_compressed_ETC1_RGB8_texture"sv }, nullptr } },
{ "WEBGL_compressed_texture_pvrtc"_string, { { "GL_IMG_texture_compression_pvrtc"sv }, nullptr } },
{ "WEBGL_compressed_texture_s3tc_srgb"_string, { { "GL_EXT_texture_compression_s3tc_srgb"sv }, Extensions::WebGLCompressedTextureS3tcSrgb::create } },
{ "WEBGL_compressed_texture_s3tc_srgb"_string, { { "GL_EXT_texture_compression_s3tc_srgb"sv }, WebGLCompressedTextureS3tcSrgb::create } },
{ "WEBGL_multi_draw"_string, { { "GL_ANGLE_multi_draw"sv }, nullptr } },
{ "WEBGL_polygon_mode"_string, { { "GL_ANGLE_polygon_mode"sv }, nullptr } },
{ "WEBGL_provoking_vertex"_string, { { "GL_ANGLE_provoking_vertex"sv }, nullptr, OpenGLContext::WebGLVersion::WebGL2 } },

View File

@@ -5305,7 +5305,6 @@ using namespace Web::UserTiming;
using namespace Web::WebAssembly;
using namespace Web::WebAudio;
using namespace Web::WebGL;
using namespace Web::WebGL::Extensions;
using namespace Web::WebIDL;
using namespace Web::WebVTT;
using namespace Web::WebXR;