beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGL: Prevent segfault due to texture destruction

Browse source 
Destruction of `GL::GLContext` resulted in the destruction of
`GPU::Driver` _before_ the destruction of the allocated textures, which
in turn point to `GPU::Image` objects. Since the destruction of
`GPU::Driver` unloads the shared library, we were trying to invoke
non-existing code.

Fix this by moving `m_driver` up in `GLContext` so that it's last in
line for destruction.
This commit is contained in:
Jelle Raaijmakers 2022-09-16 23:41:11 +02:00 committed by Brian Gianforcaro
parent 645f6e3c4a
commit f6dfd77268
Notes: sideshowbarker 2024-07-17 06:54:38 +09:00 
Author: https://github.com/gmta
Commit: https://github.com/SerenityOS/serenity/commit/f6dfd77268
Pull-request: https://github.com/SerenityOS/serenity/pull/15267
Reviewed-by: https://github.com/bgianfo ✅
Reviewed-by: https://github.com/sunverwerth ✅
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibGL/GLContext.cpp
View file

@ -21,11 +21,11 @@ __attribute__((visibility("hidden"))) GL::GLContext* g_gl_context;
namespace GL {
GLContext::GLContext(RefPtr<GPU::Driver> driver, NonnullOwnPtr<GPU::Device> device, Gfx::Bitmap& frontbuffer)
: m_viewport { frontbuffer.rect() }
, m_frontbuffer { frontbuffer }
, m_driver { driver }
: m_driver { driver }
, m_rasterizer { move(device) }
, m_device_info { m_rasterizer->info() }
, m_viewport { frontbuffer.rect() }
, m_frontbuffer { frontbuffer }
{
m_texture_units.resize(m_device_info.num_texture_units);
m_active_texture_unit = &m_texture_units[0];

10
Userland/Libraries/LibGL/GLContext.h
View file

@ -254,6 +254,13 @@ private:
[[nodiscard]] bool should_append_to_listing() const { return m_current_listing_index.has_value(); }
[[nodiscard]] bool should_execute_after_appending_to_listing() const { return m_current_listing_index.has_value() && m_current_listing_index->mode == GL_COMPILE_AND_EXECUTE; }
// FIXME: we store GPU::Texture objects that do not point back to either the driver or device, so we need
// to destruct the latter two at the very end. Fix this by making all GPU objects point back to
// the device that created them, and the device back to the driver.
RefPtr<GPU::Driver> m_driver;
NonnullOwnPtr<GPU::Device> m_rasterizer;
GPU::DeviceInfo const m_device_info;
GLenum m_current_draw_mode;
GLenum m_current_matrix_mode { GL_MODELVIEW };
@ -374,9 +381,6 @@ private:
return m_texture_coordinate_generation[texture_unit][capability - GL_TEXTURE_GEN_S];
}
RefPtr<GPU::Driver> m_driver;
NonnullOwnPtr<GPU::Device> m_rasterizer;
GPU::DeviceInfo const m_device_info;
bool m_sampler_config_is_dirty { true };
bool m_light_state_is_dirty { true };