Merge pull request #14089 from hrydgard/opengl-restore-fix

GL: Call CreateDeviceObjects *after* updating render_.
hrydgard · Feb 9, 2021 · c4a4fbd · c4a4fbd
2 parents b539ce8 + 252160b
commit c4a4fbd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp
@@ -103,9 +103,8 @@ FramebufferManagerGLES::FramebufferManagerGLES(Draw::DrawContext *draw, GLRender
 {
 	needBackBufferYSwap_ = true;
 	needGLESRebinds_ = true;
-	CreateDeviceObjects();
-	render_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
 	presentation_->SetLanguage(draw_->GetShaderLanguageDesc().shaderLanguage);
+	CreateDeviceObjects();
 }
 
 void FramebufferManagerGLES::Init() {
@@ -344,8 +343,8 @@ void FramebufferManagerGLES::DeviceLost() {
 
 void FramebufferManagerGLES::DeviceRestore(Draw::DrawContext *draw) {
 	FramebufferManagerCommon::DeviceRestore(draw);
-	CreateDeviceObjects();
 	render_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
+	CreateDeviceObjects();
 }
 
 void FramebufferManagerGLES::Resized() {