RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 08:37:35 +00:00
Code Issues Activity Actions

LibAccelGfx+LibWeb: Explicitly pass OpenGL context to Painter

Browse source 
Let's not assume there is one global OpenGL context because it might
change once we will start creating >1 page inside single WebContent
process or contexts for WebGL.
This commit is contained in:
Aliaksandr Kalenik 2023-12-16 16:22:11 +01:00 • committed by Andreas Kling
parent ed1ade0534
commit 161082e282
8 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibAccelGfx/Context.cpp
View file

@ -16,14 +16,6 @@
namespace AccelGfx {
Context& Context::the()
{
static OwnPtr<Context> s_the;
if (!s_the)
s_the = Context::create();
return *s_the;
}
#ifdef AK_OS_MACOS
static void make_context_cgl()
{

2
Userland/Libraries/LibAccelGfx/Context.h
View file

@ -20,8 +20,6 @@ namespace AccelGfx {
class Context {
public:
static Context& the();
static OwnPtr<Context> create();
Context()

3
Userland/Libraries/LibAccelGfx/Painter.cpp
View file

@ -170,9 +170,8 @@ void main() {
HashMap<u32, GL::Texture> s_immutable_bitmap_texture_cache;
NonnullOwnPtr<Painter> Painter::create()
NonnullOwnPtr<Painter> Painter::create(Context& context)
{
auto& context = Context::the();
return make<Painter>(context);
}

2
Userland/Libraries/LibAccelGfx/Painter.h
View file

@ -29,7 +29,7 @@ class Painter {
AK_MAKE_NONMOVABLE(Painter);
public:
static NonnullOwnPtr<Painter> create();
static NonnullOwnPtr<Painter> create(Context&);
Painter(Context&);
~Painter();

11
Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.cpp
View file

@ -9,10 +9,11 @@
namespace Web::Painting {
PaintingCommandExecutorGPU::PaintingCommandExecutorGPU(Gfx::Bitmap& bitmap)
PaintingCommandExecutorGPU::PaintingCommandExecutorGPU(AccelGfx::Context& context, Gfx::Bitmap& bitmap)
: m_target_bitmap(bitmap)
, m_context(context)
{
auto painter = AccelGfx::Painter::create();
auto painter = AccelGfx::Painter::create(m_context);
auto canvas = AccelGfx::Canvas::create(bitmap.size());
painter->set_target_canvas(canvas);
m_stacking_contexts.append({ .canvas = canvas,
@ -114,7 +115,7 @@ CommandResult PaintingCommandExecutorGPU::push_stacking_context(float opacity, b
final_transform.multiply(stacking_context_transform);
final_transform.multiply(inverse_origin_translation);
if (opacity < 1 || !stacking_context_transform.is_identity_or_translation()) {
auto painter = AccelGfx::Painter::create();
auto painter = AccelGfx::Painter::create(m_context);
auto canvas = AccelGfx::Canvas::create(source_paintable_rect.size());
painter->set_target_canvas(canvas);
painter->translate(-source_paintable_rect.location().to_type<float>());
@ -168,7 +169,7 @@ CommandResult PaintingCommandExecutorGPU::paint_inner_box_shadow(PaintOuterBoxSh
CommandResult PaintingCommandExecutorGPU::paint_text_shadow(int blur_radius, Gfx::IntRect const& shadow_bounding_rect, Gfx::IntRect const& text_rect, Span<Gfx::DrawGlyphOrEmoji const> glyph_run, Color const& color, int fragment_baseline, Gfx::IntPoint const& draw_location)
{
auto text_shadow_canvas = AccelGfx::Canvas::create(shadow_bounding_rect.size());
auto text_shadow_painter = AccelGfx::Painter::create();
auto text_shadow_painter = AccelGfx::Painter::create(m_context);
text_shadow_painter->set_target_canvas(text_shadow_canvas);
text_shadow_painter->clear(color.with_alpha(0));
@ -182,7 +183,7 @@ CommandResult PaintingCommandExecutorGPU::paint_text_shadow(int blur_radius, Gfx
}
auto horizontal_blur_canvas = AccelGfx::Canvas::create(shadow_bounding_rect.size());
auto horizontal_blur_painter = AccelGfx::Painter::create();
auto horizontal_blur_painter = AccelGfx::Painter::create(m_context);
horizontal_blur_painter->set_target_canvas(horizontal_blur_canvas);
horizontal_blur_painter->clear(color.with_alpha(0));
horizontal_blur_painter->blit_blurred_canvas(shadow_bounding_rect.to_type<float>(), *text_shadow_canvas, blur_radius, AccelGfx::Painter::BlurDirection::Horizontal);

3
Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.h
View file

@ -55,11 +55,12 @@ public:
bool needs_update_immutable_bitmap_texture_cache() const override { return true; }
void update_immutable_bitmap_texture_cache(HashMap<u32, Gfx::ImmutableBitmap const*>&) override;
PaintingCommandExecutorGPU(Gfx::Bitmap& bitmap);
PaintingCommandExecutorGPU(AccelGfx::Context&, Gfx::Bitmap& bitmap);
~PaintingCommandExecutorGPU() override;
private:
Gfx::Bitmap& m_target_bitmap;
AccelGfx::Context& m_context;
struct StackingContext {
RefPtr<AccelGfx::Canvas> canvas;