Skip to content

Commit d08915a

Browse files
Lubrsigmta
Lubrsi
authored and
gmta
committed
LibWeb/WebGL: Implement the WEBGL_compressed_texture_s3tc_srgb extension
1 parent ddf60eb commit d08915a

10 files changed

+117
-0
lines changed

‎Libraries/LibWeb/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,7 @@ set(SOURCES
10271027
WebGL/Extensions/EXTTextureNorm16.cpp
10281028
WebGL/Extensions/OESVertexArrayObject.cpp
10291029
WebGL/Extensions/WebGLCompressedTextureS3tc.cpp
1030+
WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.cpp
10301031
WebGL/Extensions/WebGLDrawBuffers.cpp
10311032
WebGL/Extensions/WebGLVertexArrayObjectOES.cpp
10321033
WebGL/OpenGLContext.cpp

‎Libraries/LibWeb/Forward.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,7 @@ class EXTRenderSnorm;
12281228
class EXTTextureNorm16;
12291229
class OESVertexArrayObject;
12301230
class WebGLCompressedTextureS3tc;
1231+
class WebGLCompressedTextureS3tcSrgb;
12311232
class WebGLDrawBuffers;
12321233
class WebGLVertexArrayObjectOES;
12331234

‎Libraries/LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.cpp‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright (c) 2025, Luke Wilde <luke@ladybird.org>
3+
*
4+
* SPDX-License-Identifier: BSD-2-Clause
5+
*/
6+
7+
#include <LibJS/Runtime/Realm.h>
8+
#include <LibWeb/Bindings/Intrinsics.h>
9+
#include <LibWeb/Bindings/WebGLCompressedTextureS3tcSrgbPrototype.h>
10+
#include <LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.h>
11+
#include <LibWeb/WebGL/OpenGLContext.h>
12+
13+
namespace Web::WebGL::Extensions {
14+
15+
GC_DEFINE_ALLOCATOR(WebGLCompressedTextureS3tcSrgb);
16+
17+
JS::ThrowCompletionOr<GC::Ptr<WebGLCompressedTextureS3tcSrgb>> WebGLCompressedTextureS3tcSrgb::create(JS::Realm& realm, WebGLRenderingContextBase* context)
18+
{
19+
return realm.create<WebGLCompressedTextureS3tcSrgb>(realm, context);
20+
}
21+
22+
WebGLCompressedTextureS3tcSrgb::WebGLCompressedTextureS3tcSrgb(JS::Realm& realm, WebGLRenderingContextBase* context)
23+
: PlatformObject(realm)
24+
, m_context(context)
25+
{
26+
m_context->context().request_extension("GL_EXT_texture_compression_s3tc_srgb");
27+
}
28+
29+
void WebGLCompressedTextureS3tcSrgb::initialize(JS::Realm& realm)
30+
{
31+
WEB_SET_PROTOTYPE_FOR_INTERFACE(WebGLCompressedTextureS3tcSrgb);
32+
Base::initialize(realm);
33+
}
34+
35+
void WebGLCompressedTextureS3tcSrgb::visit_edges(Visitor& visitor)
36+
{
37+
Base::visit_edges(visitor);
38+
visitor.visit(m_context->gc_cell());
39+
}
40+
41+
}

‎Libraries/LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (c) 2025, Luke Wilde <luke@ladybird.org>
3+
*
4+
* SPDX-License-Identifier: BSD-2-Clause
5+
*/
6+
7+
#pragma once
8+
9+
#include <LibWeb/Bindings/PlatformObject.h>
10+
#include <LibWeb/Forward.h>
11+
#include <LibWeb/WebGL/WebGLRenderingContextBase.h>
12+
13+
namespace Web::WebGL::Extensions {
14+
15+
class WebGLCompressedTextureS3tcSrgb : public Bindings::PlatformObject {
16+
WEB_PLATFORM_OBJECT(WebGLCompressedTextureS3tcSrgb, Bindings::PlatformObject);
17+
GC_DECLARE_ALLOCATOR(WebGLCompressedTextureS3tcSrgb);
18+
19+
public:
20+
static JS::ThrowCompletionOr<GC::Ptr<WebGLCompressedTextureS3tcSrgb>> create(JS::Realm&, WebGLRenderingContextBase*);
21+
22+
protected:
23+
void initialize(JS::Realm&) override;
24+
void visit_edges(Visitor&) override;
25+
26+
private:
27+
WebGLCompressedTextureS3tcSrgb(JS::Realm&, WebGLRenderingContextBase*);
28+
29+
// FIXME: It should be GC::Ptr instead of raw pointer, but we need to make WebGLRenderingContextBase inherit from PlatformObject first.
30+
WebGLRenderingContextBase* m_context;
31+
};
32+
33+
}

‎Libraries/LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.idl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#import <WebGL/Types.idl>
2+
3+
// https://registry.khronos.org/webgl/extensions/WEBGL_compressed_texture_s3tc_srgb/
4+
// NOTE: Original WEBGL_compressed_texture_s3tc_srgb name is changed to title case,
5+
// so it matches corresponding C++ class name, and does not require
6+
// IDL generator to handle snake_case to TitleCase conversion.
7+
// Having a different name is totally fine, because LegacyNoInterfaceObject
8+
// prevents the name from being exposed to JavaScript.
9+
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
10+
interface WebGLCompressedTextureS3tcSrgb {
11+
// Compressed Texture Formats
12+
const GLenum COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
13+
const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
14+
const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;
15+
const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F;
16+
};

‎Libraries/LibWeb/WebGL/WebGL2RenderingContext.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <LibWeb/WebGL/Extensions/EXTRenderSnorm.h>
2020
#include <LibWeb/WebGL/Extensions/EXTTextureNorm16.h>
2121
#include <LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tc.h>
22+
#include <LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.h>
2223
#include <LibWeb/WebGL/OpenGLContext.h>
2324
#include <LibWeb/WebGL/WebGL2RenderingContext.h>
2425
#include <LibWeb/WebGL/WebGLContextEvent.h>
@@ -80,6 +81,7 @@ void WebGL2RenderingContext::visit_edges(Cell::Visitor& visitor)
8081
visitor.visit(m_ext_render_snorm);
8182
visitor.visit(m_ext_texture_norm16);
8283
visitor.visit(m_webgl_compressed_texture_s3tc_extension);
84+
visitor.visit(m_webgl_compressed_texture_s3tc_srgb_extension);
8385
}
8486

8587
void WebGL2RenderingContext::present()
@@ -177,6 +179,15 @@ JS::Object* WebGL2RenderingContext::get_extension(String const& name)
177179
return m_webgl_compressed_texture_s3tc_extension;
178180
}
179181

182+
if (name.equals_ignoring_ascii_case("WEBGL_compressed_texture_s3tc_srgb"sv)) {
183+
if (!m_webgl_compressed_texture_s3tc_srgb_extension) {
184+
m_webgl_compressed_texture_s3tc_srgb_extension = MUST(Extensions::WebGLCompressedTextureS3tcSrgb::create(realm(), this));
185+
}
186+
187+
VERIFY(m_webgl_compressed_texture_s3tc_srgb_extension);
188+
return m_webgl_compressed_texture_s3tc_srgb_extension;
189+
}
190+
180191
if (name.equals_ignoring_ascii_case("EXT_color_buffer_float"sv)) {
181192
if (!m_ext_color_buffer_float_extension) {
182193
m_ext_color_buffer_float_extension = MUST(Extensions::EXTColorBufferFloat::create(realm(), *this));

‎Libraries/LibWeb/WebGL/WebGL2RenderingContext.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class WebGL2RenderingContext : public Bindings::PlatformObject
8686
GC::Ptr<Extensions::EXTRenderSnorm> m_ext_render_snorm;
8787
GC::Ptr<Extensions::EXTTextureNorm16> m_ext_texture_norm16;
8888
GC::Ptr<Extensions::WebGLCompressedTextureS3tc> m_webgl_compressed_texture_s3tc_extension;
89+
GC::Ptr<Extensions::WebGLCompressedTextureS3tcSrgb> m_webgl_compressed_texture_s3tc_srgb_extension;
8990

9091
virtual void set_error(GLenum error) override;
9192
};

‎Libraries/LibWeb/WebGL/WebGLRenderingContext.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <LibWeb/WebGL/Extensions/EXTBlendMinMax.h>
1919
#include <LibWeb/WebGL/Extensions/OESVertexArrayObject.h>
2020
#include <LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tc.h>
21+
#include <LibWeb/WebGL/Extensions/WebGLCompressedTextureS3tcSrgb.h>
2122
#include <LibWeb/WebGL/Extensions/WebGLDrawBuffers.h>
2223
#include <LibWeb/WebGL/OpenGLContext.h>
2324
#include <LibWeb/WebGL/WebGLContextEvent.h>
@@ -97,6 +98,7 @@ void WebGLRenderingContext::visit_edges(Cell::Visitor& visitor)
9798
visitor.visit(m_ext_blend_min_max_extension);
9899
visitor.visit(m_oes_vertex_array_object_extension);
99100
visitor.visit(m_webgl_compressed_texture_s3tc_extension);
101+
visitor.visit(m_webgl_compressed_texture_s3tc_srgb_extension);
100102
visitor.visit(m_webgl_draw_buffers_extension);
101103
}
102104

@@ -222,6 +224,15 @@ JS::Object* WebGLRenderingContext::get_extension(String const& name)
222224
return m_webgl_compressed_texture_s3tc_extension;
223225
}
224226

227+
if (name.equals_ignoring_ascii_case("WEBGL_compressed_texture_s3tc_srgb"sv)) {
228+
if (!m_webgl_compressed_texture_s3tc_srgb_extension) {
229+
m_webgl_compressed_texture_s3tc_srgb_extension = MUST(Extensions::WebGLCompressedTextureS3tcSrgb::create(realm(), this));
230+
}
231+
232+
VERIFY(m_webgl_compressed_texture_s3tc_srgb_extension);
233+
return m_webgl_compressed_texture_s3tc_srgb_extension;
234+
}
235+
225236
if (name.equals_ignoring_ascii_case("WEBGL_draw_buffers"sv)) {
226237
if (!m_webgl_draw_buffers_extension) {
227238
m_webgl_draw_buffers_extension = MUST(Extensions::WebGLDrawBuffers::create(realm(), *this));

‎Libraries/LibWeb/WebGL/WebGLRenderingContext.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class WebGLRenderingContext : public Bindings::PlatformObject
8585
GC::Ptr<Extensions::EXTBlendMinMax> m_ext_blend_min_max_extension;
8686
GC::Ptr<Extensions::OESVertexArrayObject> m_oes_vertex_array_object_extension;
8787
GC::Ptr<Extensions::WebGLCompressedTextureS3tc> m_webgl_compressed_texture_s3tc_extension;
88+
GC::Ptr<Extensions::WebGLCompressedTextureS3tcSrgb> m_webgl_compressed_texture_s3tc_srgb_extension;
8889
GC::Ptr<Extensions::WebGLDrawBuffers> m_webgl_draw_buffers_extension;
8990

9091
virtual void set_error(GLenum error) override;

‎Libraries/LibWeb/idl_files.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ libweb_js_bindings(WebGL/Extensions/EXTRenderSnorm)
475475
libweb_js_bindings(WebGL/Extensions/EXTTextureNorm16)
476476
libweb_js_bindings(WebGL/Extensions/OESVertexArrayObject)
477477
libweb_js_bindings(WebGL/Extensions/WebGLCompressedTextureS3tc)
478+
libweb_js_bindings(WebGL/Extensions/WebGLCompressedTextureS3tcSrgb)
478479
libweb_js_bindings(WebGL/Extensions/WebGLDrawBuffers)
479480
libweb_js_bindings(WebGL/Extensions/WebGLVertexArrayObjectOES)
480481
libweb_js_bindings(WebGL/WebGL2RenderingContext)

0 commit comments

Comments
 (0)