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

If creating EGL GLES3 context fails, try without debug bit. Refs #1052

Browse Source
This commit is contained in:
baldurk
2018-07-30 13:02:11 +01:00
parent d060eb354e
commit 5293a2c991
1 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/egl_platform.cpp
+42 -25
View File
@@ -171,39 +171,56 @@ class EGLPlatform : public GLPlatform
// extensions) to function.
EGLContext ctx = NULL;
// don't change this ar ray without changing indices in the loop below
EGLint verAttribs[] = {EGL_CONTEXT_MAJOR_VERSION_KHR,
3,
EGL_CONTEXT_MINOR_VERSION_KHR,
1,
EGL_CONTEXT_FLAGS_KHR,
EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR,
EGL_NONE};
std::vector<GLVersion> versions = GetReplayVersions(RDCDriver::OpenGLES);
for(GLVersion v : versions)
// first we try with the debug bit set, then if that fails we try without debug
for(int debugPass = 0; debugPass < 2; debugPass++)
{
verAttribs[1] = v.major;
verAttribs[3] = v.minor;
ctx = EGL.CreateContext(eglDisplay, ret.egl_cfg, share_ctx, verAttribs);
// don't change this ar ray without changing indices in the loop below
EGLint verAttribs[] = {
EGL_CONTEXT_MAJOR_VERSION_KHR,
3,
EGL_CONTEXT_MINOR_VERSION_KHR,
1,
debugPass == 0 ? EGL_CONTEXT_FLAGS_KHR : EGL_NONE,
EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR,
EGL_NONE,
};
std::vector<GLVersion> versions = GetReplayVersions(RDCDriver::OpenGLES);
for(GLVersion v : versions)
{
verAttribs[1] = v.major;
verAttribs[3] = v.minor;
ctx = EGL.CreateContext(eglDisplay, ret.egl_cfg, share_ctx, verAttribs);
if(ctx)
break;
}
// if we got it using the major/minor pattern, then stop
if(ctx)
break;
// if none of the above worked, try just creating with the client version as 3
const EGLint baseAttribs[] = {
EGL_CONTEXT_CLIENT_VERSION,
3,
debugPass == 0 ? EGL_CONTEXT_FLAGS_KHR : EGL_NONE,
EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR,
EGL_NONE,
};
ctx = EGL.CreateContext(eglDisplay, ret.egl_cfg, share_ctx, baseAttribs);
// if it succeeded, stop
if(ctx)
break;
}
// if none of the above worked, try just creating with the client version as 3
if(!ctx)
{
static const EGLint baseAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_CONTEXT_FLAGS_KHR,
EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR, EGL_NONE};
ctx = EGL.CreateContext(eglDisplay, ret.egl_cfg, share_ctx, baseAttribs);
}
// if after that loop we still don't have a context, bail completely
if(ctx == NULL)
{
RDCERR("Couldn't create GL ES context");
RDCERR("Couldn't create GLES3 context");
return ret;
}