diff --git a/Common/GPU/OpenGL/GLQueueRunner.cpp b/Common/GPU/OpenGL/GLQueueRunner.cpp index e85d830e5a..c5e2cb4d5e 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.cpp +++ b/Common/GPU/OpenGL/GLQueueRunner.cpp @@ -1775,6 +1775,11 @@ void GLQueueRunner::fbo_unbind() { CHECK_GL_ERROR_IF_DEBUG(); } +std::string GLQueueRunner::GetGLString(int name) const { + auto it = glStrings_.find(name); + return it != glStrings_.end() ? it->second : ""; +} + GLRFramebuffer::~GLRFramebuffer() { if (handle == 0 && z_stencil_buffer == 0 && z_buffer == 0 && stencil_buffer == 0) return; diff --git a/Common/GPU/OpenGL/GLQueueRunner.h b/Common/GPU/OpenGL/GLQueueRunner.h index a0a058c335..1261bb9ab2 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.h +++ b/Common/GPU/OpenGL/GLQueueRunner.h @@ -370,10 +370,7 @@ public: return sawOutOfMemory_; } - std::string GetGLString(int name) const { - auto it = glStrings_.find(name); - return it != glStrings_.end() ? it->second : ""; - } + std::string GetGLString(int name) const; private: void InitCreateFramebuffer(const GLRInitStep &step); diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 248ed5052d..307ad5e122 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -195,6 +195,9 @@ u32 GPU_GLES::CheckGPUFeatures() const { void GPU_GLES::BuildReportingInfo() { GLRenderManager *render = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER); + if (!render) { + return; + } std::string glVendor = render->GetGLString(GL_VENDOR); std::string glRenderer = render->GetGLString(GL_RENDERER);