LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"

Browse Source 
* commit '00736340f50538abba585b1d8c5bba049e35b68f':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
This commit is contained in:
David Turner
2011-06-21 23:56:21 -07:00
committed by Android Git Automerger
parent 3001b51243 00736340f5
commit 95d7f3ce1d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp
View File

@@ -249,17 +249,16 @@ int FBConfig::chooseConfig(FrameBuffer *fb, EGLint * attribs, uint32_t * configs
attrib_p += attribCnt; attrib_p += attribCnt;
*attrib_p = EGL_NONE; *attrib_p = EGL_NONE;
#if 1 #if 0
DBG("EGLint %d", sizeof(EGLint));
if (newAttribs) { if (newAttribs) {
EGLint * attrib_p = newAttribs; EGLint * attrib_p = newAttribs;
while (attrib_p[0] != EGL_NONE) { while (attrib_p[0] != EGL_NONE) {
DBG("attr: 0x%x %d", attrib_p[0], attrib_p[1]); DBG("attr: 0x%x %d, ", attrib_p[0], attrib_p[1]);
attrib_p += 2; attrib_p += 2;
} }
} }
#endif #endif
s_egl.eglChooseConfig(dpy, newAttribs, matchedConfigs, nConfigs, &nConfigs); s_egl.eglChooseConfig(dpy, newAttribs, matchedConfigs, nConfigs, &nConfigs);
delete newAttribs; delete newAttribs;
@@ -269,14 +268,17 @@ int FBConfig::chooseConfig(FrameBuffer *fb, EGLint * attribs, uint32_t * configs
// //
uint32_t nVerifiedCfgs = 0; uint32_t nVerifiedCfgs = 0;
for (int matchedIdx=0; matchedIdx<nConfigs; matchedIdx++) { for (int matchedIdx=0; matchedIdx<nConfigs; matchedIdx++) {
if (nVerifiedCfgs >= configs_size) break; //We have enouhgt configs if ((configs_size > 0) && (nVerifiedCfgs >= configs_size)) break; //We have enouhgt configs
int sCfgId; int sCfgId;
s_egl.eglGetConfigAttrib(dpy, matchedConfigs[matchedIdx], EGL_CONFIG_ID, &sCfgId); s_egl.eglGetConfigAttrib(dpy, matchedConfigs[matchedIdx], EGL_CONFIG_ID, &sCfgId);
for (int fbIdx=0; fbIdx<s_numConfigs; fbIdx++) { for (int fbIdx=0; fbIdx<s_numConfigs; fbIdx++) {
int dCfgId = s_fbConfigs[fbIdx]->m_attribValues[4]; //CONFIG_ID int dCfgId = s_fbConfigs[fbIdx]->m_attribValues[4]; //CONFIG_ID
if (sCfgId == dCfgId) { if (sCfgId == dCfgId) {
//This config matches the requested attributes and filtered into fbConfigs, so we're happy with it //This config matches the requested attributes and filtered into fbConfigs, so we're happy with it
configs[nVerifiedCfgs++] = fbIdx; if (nVerifiedCfgs < configs_size) {
configs[nVerifiedCfgs] = fbIdx;
}
nVerifiedCfgs++;
break; break;
} }
} }