From 4511c0b86f146b2e5b91e6e876eb2664519c13f4 Mon Sep 17 00:00:00 2001
From: Peter Gal <pgal.u-szeged@partner.samsung.com>
Date: Thu, 16 Feb 2017 20:48:00 +0100
Subject: [PATCH] Add explicit initialization of the GL ES driver

When the EGL api was invoked a normal OpenGL
driver was created instead of a GL ES driver.

With this modification we explicitly initialize the
OpenGL ES driver in case of EGL api calls.
In every other case we assume the normal OpenGL driver.
---
 renderdoc/driver/gl/gl_hooks_egl.cpp          | 8 ++++++++
 renderdoc/driver/gl/gl_hooks_linux_shared.cpp | 9 ++++++++-
 renderdoc/driver/gl/gl_hooks_linux_shared.h   | 1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/gl/gl_hooks_egl.cpp b/renderdoc/driver/gl/gl_hooks_egl.cpp
index 7f7333efb..24d09b057 100644
--- a/renderdoc/driver/gl/gl_hooks_egl.cpp
+++ b/renderdoc/driver/gl/gl_hooks_egl.cpp
@@ -70,6 +70,7 @@ public:
   {
     libGLdlsymHandle = realLib;
     EGLHook::glhooks.CreateHooks(NULL);
+    ::GetDriver()->SetDriverType(RDC_OpenGLES);
   }
 
   bool CreateHooks(const char *libName)
@@ -179,7 +180,10 @@ public:
   WrappedOpenGL *GetDriver()
   {
     if(m_GLDriver == NULL)
+    {
       m_GLDriver = new WrappedOpenGL("", GL);
+      m_GLDriver->SetDriverType(RDC_OpenGLES);
+    }
 
     return m_GLDriver;
   }
@@ -318,6 +322,7 @@ __attribute__((visibility("default"))) EGLContext eglCreateContext(EGLDisplay di
   data.egl_wnd = (EGLSurface)NULL;
   data.egl_ctx = ret;
 
+  InitDriver(RDC_OpenGLES);
   {
     SCOPED_LOCK(glLock);
     GetDriver()->CreateContext(data, shareContext, init, true, true);
@@ -331,6 +336,7 @@ __attribute__((visibility("default"))) EGLBoolean eglDestroyContext(EGLDisplay d
   if(EGLHook::glhooks.eglDestroyContext_real == NULL)
     EGLHook::glhooks.SetupExportedFunctions();
 
+  InitDriver(RDC_OpenGLES);
   {
     SCOPED_LOCK(glLock);
     GetDriver()->DeleteContext(ctx);
@@ -361,6 +367,7 @@ __attribute__((visibility("default"))) EGLBoolean eglMakeCurrent(EGLDisplay disp
   data.egl_wnd = draw;
   data.egl_ctx = ctx;
 
+  InitDriver(RDC_OpenGLES);
   GetDriver()->ActivateContext(data);
 
   return ret;
@@ -377,6 +384,7 @@ __attribute__((visibility("default"))) EGLBoolean eglSwapBuffers(EGLDisplay dpy,
   EGLHook::glhooks.eglQuerySurface_real(dpy, surface, EGL_HEIGHT, &height);
   EGLHook::glhooks.eglQuerySurface_real(dpy, surface, EGL_WIDTH, &width);
 
+  InitDriver(RDC_OpenGLES);
   GetDriver()->WindowSize(surface, width, height);
   GetDriver()->SwapBuffers(surface);
 
diff --git a/renderdoc/driver/gl/gl_hooks_linux_shared.cpp b/renderdoc/driver/gl/gl_hooks_linux_shared.cpp
index fa2b87015..52284c0bb 100644
--- a/renderdoc/driver/gl/gl_hooks_linux_shared.cpp
+++ b/renderdoc/driver/gl/gl_hooks_linux_shared.cpp
@@ -38,11 +38,18 @@ Threading::CriticalSection glLock;
 void *libGLdlsymHandle =
     RTLD_NEXT;    // default to RTLD_NEXT, but overwritten if app calls dlopen() on real libGL
 
-WrappedOpenGL *GetDriver()
+void InitDriver(RDCDriver type)
 {
   if(m_GLDriver == NULL)
+  {
     m_GLDriver = new WrappedOpenGL("", GL);
+    m_GLDriver->SetDriverType(type);
+  }
+}
 
+WrappedOpenGL *GetDriver()
+{
+  InitDriver(RDC_OpenGL);
   return m_GLDriver;
 }
 
diff --git a/renderdoc/driver/gl/gl_hooks_linux_shared.h b/renderdoc/driver/gl/gl_hooks_linux_shared.h
index ad0e198f3..b05eee37b 100644
--- a/renderdoc/driver/gl/gl_hooks_linux_shared.h
+++ b/renderdoc/driver/gl/gl_hooks_linux_shared.h
@@ -30,6 +30,7 @@ void CloneDisplay(Display *dpy);
 
 void *SharedLookupFuncPtr(const char *func, void *realFunc);
 bool SharedPopulateHooks(void *(*lookupFunc)(const char *));
+void InitDriver(RDCDriver type);
 WrappedOpenGL *GetDriver();
 
 extern GLHookSet GL;