lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed looping through of eglCreateContext's attribute list

Browse Source 
I fixed an issue in the looping of eglCreateContext's attribute list where it was going until the attribute name was 0 instead of EGL_NONE.
This commit is contained in:
scottmarsland
2018-05-01 16:10:38 +01:00
committed by Baldur Karlsson
parent e51466efe1
commit b849df4143
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_hooks_egl.cpp
+31 -25
View File
@@ -225,52 +225,58 @@ __attribute__((visibility("default"))) EGLContext eglCreateContext(EGLDisplay di
{
PosixHookReapply();
EGLint defaultAttribList[] = {0};
vector<EGLint> attribs;
const EGLint *attribs = attribList ? attribList : defaultAttribList;
vector<EGLint> attribVec;
// modify attribs to our liking
// modify attribList to our liking
{
bool flagsFound = false;
const int *a = attribs;
while(*a)
if(attribList)
{
int name = *a++;
int val = *a++;
const EGLint *ptr = attribList;
if(name == EGL_CONTEXT_FLAGS_KHR)
for(;;)
{
if(RenderDoc::Inst().GetCaptureOptions().apiValidation)
val |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
else
val &= ~EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
EGLint name = *ptr++;
flagsFound = true;
if(name == EGL_NONE)
{
break;
}
EGLint value = *ptr++;
if(name == EGL_CONTEXT_FLAGS_KHR)
{
if(RenderDoc::Inst().GetCaptureOptions().apiValidation)
value |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
else
value &= ~EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
flagsFound = true;
}
attribs.push_back(name);
attribs.push_back(value);
}
attribVec.push_back(name);
attribVec.push_back(val);
}
if(!flagsFound && RenderDoc::Inst().GetCaptureOptions().apiValidation)
{
attribVec.push_back(EGL_CONTEXT_FLAGS_KHR);
attribVec.push_back(EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR);
attribs.push_back(EGL_CONTEXT_FLAGS_KHR);
attribs.push_back(EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR);
}
attribVec.push_back(EGL_NONE);
attribs = &attribVec[0];
attribs.push_back(EGL_NONE);
}
if(eglhooks.real.CreateContext == NULL)
eglhooks.SetupExportedFunctions();
EGLContext ret = eglhooks.real.CreateContext(display, config, shareContext, attribs);
EGLContext ret = eglhooks.real.CreateContext(display, config, shareContext, attribs.data());
// don't continue if context creation failed
if(!ret)
if(ret == EGL_NO_CONTEXT)
return ret;
GLInitParams init;