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

am b49454ac: Merge "opengles emulator: limit X11 configs some more"

Browse Source 
* commit 'b49454ac3958a3497e1a715cc3471805f14ab84a':
  opengles emulator: limit X11 configs some more
This commit is contained in:
David Turner
2011-08-10 01:18:08 -07:00
committed by Android Git Automerger
parent a9605f5576 b49454ac39
commit 69ae2a4ae2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp
View File

@@ -91,6 +91,7 @@ EglConfig* pixelFormatToConfig(EGLNativeDisplayType dpy,int renderableType,EGLNa
int pMaxWidth,pMaxHeight,pMaxPixels; int pMaxWidth,pMaxHeight,pMaxPixels;
int tmp; int tmp;
int configId,level,renderable; int configId,level,renderable;
int doubleBuffer;
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_TRANSPARENT_TYPE,&tmp)); IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_TRANSPARENT_TYPE,&tmp));
if(tmp == GLX_TRANSPARENT_INDEX) { if(tmp == GLX_TRANSPARENT_INDEX) {
@@ -106,6 +107,12 @@ EglConfig* pixelFormatToConfig(EGLNativeDisplayType dpy,int renderableType,EGLNa
} }
//
// filter out single buffer configurations
//
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_DOUBLEBUFFER,&doubleBuffer));
if (!doubleBuffer) return NULL;
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_BUFFER_SIZE,&bSize)); IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_BUFFER_SIZE,&bSize));
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_RED_SIZE,&red)); IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_RED_SIZE,&red));
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_GREEN_SIZE,&green)); IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_GREEN_SIZE,&green));
@@ -123,13 +130,12 @@ EglConfig* pixelFormatToConfig(EGLNativeDisplayType dpy,int renderableType,EGLNa
//supported surfaces types //supported surfaces types
IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_DRAWABLE_TYPE,&tmp)); IS_SUCCESS(glXGetFBConfigAttrib(dpy,*frmt,GLX_DRAWABLE_TYPE,&tmp));
supportedSurfaces = 0; supportedSurfaces = 0;
if(tmp & GLX_WINDOW_BIT) { if(tmp & GLX_WINDOW_BIT && visualId != 0) {
supportedSurfaces |= EGL_WINDOW_BIT; supportedSurfaces |= EGL_WINDOW_BIT;
} else { } else {
visualId = 0; visualId = 0;
visualType = EGL_NONE; visualType = EGL_NONE;
} }
if(tmp & GLX_PIXMAP_BIT) supportedSurfaces |= EGL_PIXMAP_BIT;
if(tmp & GLX_PBUFFER_BIT) supportedSurfaces |= EGL_PBUFFER_BIT; if(tmp & GLX_PBUFFER_BIT) supportedSurfaces |= EGL_PBUFFER_BIT;
caveat = 0; caveat = 0;