lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-22 21:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add explicit initialization of the GL ES driver

Browse Source 
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.
This commit is contained in:
Peter Gal
2017-02-17 20:19:19 +00:00
committed by Baldur Karlsson
parent bea403743a
commit 4511c0b86f
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_hooks_egl.cpp
+8
View File
@@ -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);
renderdoc/driver/gl/gl_hooks_linux_shared.cpp
+8 -1
View File
@@ -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;
}
renderdoc/driver/gl/gl_hooks_linux_shared.h
+1
View File
@@ -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;