From 61606d8aea210b4afbf6370684b47ef3972517b2 Mon Sep 17 00:00:00 2001
From: michaelrgb <m.rennie@partner.samsung.com>
Date: Tue, 19 Sep 2017 12:04:50 +0100
Subject: [PATCH] Fix offscreen render setting GLWindowingData::wnd=0, an error
 condition.

---
 renderdoc/driver/gl/gl_common.h      | 8 +++++---
 renderdoc/driver/gl/gl_hooks_egl.cpp | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 9c3bbfc60..b7a48906b 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -161,7 +161,6 @@ struct GLWindowingData
     egl_ctx = 0;
     egl_dpy = 0;
     egl_wnd = 0;
-    wnd = 0;
   }
 
   void SetCtx(void *c) { egl_ctx = (void *)c; }
@@ -172,8 +171,11 @@ struct GLWindowingData
     EGLContext egl_ctx;
   };
   EGLDisplay egl_dpy;
-  EGLSurface egl_wnd;
-  ANativeWindow *wnd;
+  union
+  {
+    EGLSurface egl_wnd;
+    void *wnd;
+  };
 };
 
 #else
diff --git a/renderdoc/driver/gl/gl_hooks_egl.cpp b/renderdoc/driver/gl/gl_hooks_egl.cpp
index 76338efe5..72f49e1de 100644
--- a/renderdoc/driver/gl/gl_hooks_egl.cpp
+++ b/renderdoc/driver/gl/gl_hooks_egl.cpp
@@ -276,9 +276,6 @@ public:
     ret.egl_dpy = eglDisplay;
     ret.egl_ctx = ctx;
     ret.egl_wnd = surface;
-#if ENABLED(RDOC_ANDROID)
-    ret.wnd = (ANativeWindow *)window;
-#endif
 
     return ret;
   }