Fix crash on macOS Catalina where GL info is missing #508
Conversation
|
Could you catch the crash with a debugger (or just put a breakpoint at |
|
So it looks like our change that removed the framebuffer caused this, the code below fixes that: I'll make a new PR for it if you are happy with it.
|
|
Your fix is a bit dirty. The platform code does not really guarantee that there will be an active GL context outside of onRender, and it should not. What about this? diff --git a/src/render/rendergl3.cpp b/src/render/rendergl3.cpp
index b3ae1fa6..e4faf4d8 100644
--- a/src/render/rendergl3.cpp
+++ b/src/render/rendergl3.cpp
@@ -87,6 +87,7 @@ public:
Fill *fill;
std::weak_ptr<const Pixmap> texture;
} current;
+ const char *vendor, *renderer, *version;
// List-initialize current to work around MSVC bug 746973.
OpenGl3Renderer() :
@@ -440,6 +441,10 @@ void OpenGl3Renderer::Init() {
meshRenderer.Init();
imeshRenderer.Init();
+ vendor = (const char *)glGetString(GL_VENDOR);
+ renderer = (const char *)glGetString(GL_RENDERER);
+ version = (const char *)glGetString(GL_VERSION);
+
#if !defined(HAVE_GLES) && !defined(__APPLE__)
GLuint array;
glGenVertexArrays(1, &array);
@@ -696,9 +701,9 @@ std::shared_ptr<Pixmap> OpenGl3Renderer::ReadFrame() {
}
void OpenGl3Renderer::GetIdent(const char **vendor, const char **renderer, const char **version) {
- *vendor = (const char *)glGetString(GL_VENDOR);
- *renderer = (const char *)glGetString(GL_RENDERER);
- *version = (const char *)glGetString(GL_VERSION);
+ *vendor = this->vendor;
+ *renderer = this->renderer;
+ *version = this->version;
}
void OpenGl3Renderer::SetCamera(const Camera &c) { |
|
Cool! Yes that looks a lot better. I will test it after work (in about 4 hours) |
|
Yes that worked as well! Shall I make a PR for it or will you apply it yourself? |
|
Fixed in 0501f0c. |
Opening the preferences no macOS Catalina crashes SolveSpace.
This is due to the way the gl_vendor / gl_renderer and gl_version is retrieved.
We use
glGetStringinrendergl3.cpp(in thegetIdentfunction).Somehow this doesn't seem to work anymore in Catalina.
Let me know if anything needs to change.