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; }