From b388aeb7b78caee176f269b882c039743b9dfc63 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 24 Mar 2023 14:47:49 +0000
Subject: [PATCH] Update window params before processing context activate.
 Closes #2890

---
 renderdoc/driver/gl/cgl_hooks.cpp | 4 ++--
 renderdoc/driver/gl/egl_hooks.cpp | 4 ++--
 renderdoc/driver/gl/glx_hooks.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/renderdoc/driver/gl/cgl_hooks.cpp b/renderdoc/driver/gl/cgl_hooks.cpp
index 80bf55f21..86c78b6d3 100644
--- a/renderdoc/driver/gl/cgl_hooks.cpp
+++ b/renderdoc/driver/gl/cgl_hooks.cpp
@@ -147,14 +147,14 @@ CGLError GL_EXPORT_NAME(CGLSetCurrentContext)(CGLContextObj ctx)
       CGL.CGSGetSurfaceBounds(conn, window, surface, &rect);
     }
 
-    cglhook.driver.ActivateContext(data);
-
     if(data.ctx)
     {
       GLInitParams &params = cglhook.driver.GetInitParams(data);
       params.width = (uint32_t)rect.size.width;
       params.height = (uint32_t)rect.size.height;
     }
+
+    cglhook.driver.ActivateContext(data);
   }
 
   return ret;
diff --git a/renderdoc/driver/gl/egl_hooks.cpp b/renderdoc/driver/gl/egl_hooks.cpp
index 76046547a..da41ca194 100644
--- a/renderdoc/driver/gl/egl_hooks.cpp
+++ b/renderdoc/driver/gl/egl_hooks.cpp
@@ -517,9 +517,9 @@ HOOK_EXPORT EGLBoolean EGLAPIENTRY eglMakeCurrent_renderdoc_hooked(EGLDisplay di
 
     eglhook.driver.SetDriverType(eglhook.activeAPI);
 
-    eglhook.driver.ActivateContext(data);
-
     eglhook.RefreshWindowParameters(data);
+
+    eglhook.driver.ActivateContext(data);
   }
 
   return ret;
diff --git a/renderdoc/driver/gl/glx_hooks.cpp b/renderdoc/driver/gl/glx_hooks.cpp
index f4eaf483d..398c2b4f0 100644
--- a/renderdoc/driver/gl/glx_hooks.cpp
+++ b/renderdoc/driver/gl/glx_hooks.cpp
@@ -415,10 +415,10 @@ HOOK_EXPORT Bool glXMakeCurrent_renderdoc_hooked(Display *dpy, GLXDrawable drawa
         data.cfg = NULL;
     }
 
-    glxhook.driver.ActivateContext(data);
-
     glxhook.UpdateWindowSize(data, dpy, drawable);
 
+    glxhook.driver.ActivateContext(data);
+
     if(config)
       XFree(config);
     if(data.cfg)
@@ -494,10 +494,10 @@ HOOK_EXPORT Bool glXMakeContextCurrent_renderdoc_hooked(Display *dpy, GLXDrawabl
         data.cfg = NULL;
     }
 
-    glxhook.driver.ActivateContext(data);
-
     glxhook.UpdateWindowSize(data, dpy, draw);
 
+    glxhook.driver.ActivateContext(data);
+
     if(config)
       XFree(config);
     if(data.cfg)