blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 07:20:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix GlContext destruction of OpenGLFunctions causing crash

Browse source
This commit is contained in:
Dan Paulat 2025-05-13 22:43:56 -05:00
parent d6e574c877
commit 46cd75cff4
2 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

57
scwx-qt/source/scwx/qt/gl/gl_context.cpp
View file

@ -16,50 +16,48 @@ static const std::string logPrefix_ = "scwx::qt::gl::gl_context";
class GlContext::Impl class GlContext::Impl
{ {
public: public:
explicit Impl() : explicit Impl() = default;
gl_ {}, ~Impl() = default;
shaderProgramMap_ {},
shaderProgramMutex_ {}, Impl(const Impl&) = delete;
textureAtlas_ {GL_INVALID_INDEX}, Impl& operator=(const Impl&) = delete;
textureMutex_ {} Impl(const Impl&&) = delete;
{ Impl& operator=(const Impl&&) = delete;
}
~Impl() {}
void InitializeGL(); void InitializeGL();
static std::size_t static std::size_t
GetShaderKey(std::initializer_list<std::pair<GLenum, std::string>> shaders); GetShaderKey(std::initializer_list<std::pair<GLenum, std::string>> shaders);
gl::OpenGLFunctions gl_; gl::OpenGLFunctions* gl_ {nullptr};
QOpenGLFunctions_3_0 gl30_; QOpenGLFunctions_3_0* gl30_ {nullptr};
bool glInitialized_ {false}; bool glInitialized_ {false};
std::unordered_map<std::size_t, std::shared_ptr<gl::ShaderProgram>> std::unordered_map<std::size_t, std::shared_ptr<gl::ShaderProgram>>
shaderProgramMap_; shaderProgramMap_ {};
std::mutex shaderProgramMutex_; std::mutex shaderProgramMutex_ {};
GLuint textureAtlas_; GLuint textureAtlas_ {GL_INVALID_INDEX};
std::mutex textureMutex_; std::mutex textureMutex_ {};
std::uint64_t textureBufferCount_ {}; std::uint64_t textureBufferCount_ {};
}; };
GlContext::GlContext() : p(std::make_unique<Impl>()) {} GlContext::GlContext() : p(std::make_unique<Impl>()) {}
GlContext::~GlContext() = default; GlContext::~GlContext() {};
GlContext::GlContext(GlContext&&) noexcept = default; GlContext::GlContext(GlContext&&) noexcept = default;
GlContext& GlContext::operator=(GlContext&&) noexcept = default; GlContext& GlContext::operator=(GlContext&&) noexcept = default;
gl::OpenGLFunctions& GlContext::gl() gl::OpenGLFunctions& GlContext::gl()
{ {
return p->gl_; return *p->gl_;
} }
QOpenGLFunctions_3_0& GlContext::gl30() QOpenGLFunctions_3_0& GlContext::gl30()
{ {
return p->gl30_; return *p->gl30_;
} }
std::uint64_t GlContext::texture_buffer_count() const std::uint64_t GlContext::texture_buffer_count() const
@ -74,10 +72,19 @@ void GlContext::Impl::InitializeGL()
return; return;
} }
gl_.initializeOpenGLFunctions(); // QOpenGLFunctions objects will not be freed. Since "destruction" takes
gl30_.initializeOpenGLFunctions(); // place at the end of program execution, it is OK to intentionally leak
// these.
gl_.glGenTextures(1, &textureAtlas_); // NOLINTBEGIN(cppcoreguidelines-owning-memory)
gl_ = new gl::OpenGLFunctions();
gl30_ = new QOpenGLFunctions_3_0();
// NOLINTEND(cppcoreguidelines-owning-memory)
gl_->initializeOpenGLFunctions();
gl30_->initializeOpenGLFunctions();
gl_->glGenTextures(1, &textureAtlas_);
glInitialized_ = true; glInitialized_ = true;
} }
@ -102,7 +109,7 @@ std::shared_ptr<gl::ShaderProgram> GlContext::GetShaderProgram(
if (it == p->shaderProgramMap_.end()) if (it == p->shaderProgramMap_.end())
{ {
shaderProgram = std::make_shared<gl::ShaderProgram>(p->gl_); shaderProgram = std::make_shared<gl::ShaderProgram>(*p->gl_);
shaderProgram->Load(shaders); shaderProgram->Load(shaders);
p->shaderProgramMap_[key] = shaderProgram; p->shaderProgramMap_[key] = shaderProgram;
} }
@ -125,7 +132,7 @@ GLuint GlContext::GetTextureAtlas()
if (p->textureBufferCount_ != textureAtlas.BuildCount()) if (p->textureBufferCount_ != textureAtlas.BuildCount())
{ {
p->textureBufferCount_ = textureAtlas.BuildCount(); p->textureBufferCount_ = textureAtlas.BuildCount();
textureAtlas.BufferAtlas(p->gl_, p->textureAtlas_); textureAtlas.BufferAtlas(*p->gl_, p->textureAtlas_);
} }
return p->textureAtlas_; return p->textureAtlas_;
@ -140,8 +147,8 @@ void GlContext::StartFrame()
{ {
auto& gl = p->gl_; auto& gl = p->gl_;
gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); gl->glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
gl.glClear(GL_COLOR_BUFFER_BIT); gl->glClear(GL_COLOR_BUFFER_BIT);
} }
std::size_t GlContext::Impl::GetShaderKey( std::size_t GlContext::Impl::GetShaderKey(

6
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -190,6 +190,8 @@ public:
map::MapProvider mapProvider_; map::MapProvider mapProvider_;
map::MapWidget* activeMap_; map::MapWidget* activeMap_;
std::shared_ptr<gl::GlContext> glContext_ {nullptr};
ui::CollapsibleGroup* mapSettingsGroup_; ui::CollapsibleGroup* mapSettingsGroup_;
ui::CollapsibleGroup* level2ProductsGroup_; ui::CollapsibleGroup* level2ProductsGroup_;
ui::CollapsibleGroup* level2SettingsGroup_; ui::CollapsibleGroup* level2SettingsGroup_;
@ -777,7 +779,7 @@ void MainWindowImpl::ConfigureMapLayout()
} }
}; };
auto glContext = std::make_shared<gl::GlContext>(); glContext_ = std::make_shared<gl::GlContext>();
for (int64_t y = 0; y < gridHeight; y++) for (int64_t y = 0; y < gridHeight; y++)
{ {
@ -790,7 +792,7 @@ void MainWindowImpl::ConfigureMapLayout()
{ {
// NOLINTNEXTLINE(cppcoreguidelines-owning-memory): Owned by parent // NOLINTNEXTLINE(cppcoreguidelines-owning-memory): Owned by parent
maps_[mapIndex] = maps_[mapIndex] =
new map::MapWidget(mapIndex, settings_, glContext); new map::MapWidget(mapIndex, settings_, glContext_);
} }
hs->addWidget(maps_[mapIndex]); hs->addWidget(maps_[mapIndex]);