ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1

Browse Source 
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
This commit is contained in:
Mathias Agopian 2011-11-30 13:54:46 -08:00 committed by Android Git Automerger
commit 03ad785b7d
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opengl/libs/EGL/eglApi.cpp
View File

@ -49,6 +49,8 @@ using namespace android;
// ----------------------------------------------------------------------------
#define EGL_VERSION_HW_ANDROID 0x3143
struct extention_map_t {
const char* name;
__eglMustCastToProperFunctionPointerType address;
@ -972,6 +974,12 @@ const char* eglQueryString(EGLDisplay dpy, EGLint name)
return dp->getExtensionString();
case EGL_CLIENT_APIS:
return dp->getClientApiString();
case EGL_VERSION_HW_ANDROID: {
if (gEGLImpl[IMPL_HARDWARE].dso) {
return dp->disp[IMPL_HARDWARE].queryString.version;
}
return dp->disp[IMPL_SOFTWARE].queryString.version;
}
}
return setError(EGL_BAD_PARAMETER, (const char *)0);
}

3
opengl/specs/README
View File

@ -9,4 +9,5 @@ for use by Android extensions.
0x3140 EGL_ANDROID_image_native_buffer
0x3141 (unused)
0x3142 EGL_ANDROID_recordable
0x3143 - 0x314F (unused)
0x3143 EGL_VERSION_HW_ANDROID (internal use)
0x3144 - 0x314F (unused)

10
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -65,6 +65,8 @@
#define AID_GRAPHICS 1003
#endif
#define EGL_VERSION_HW_ANDROID 0x3143
#define DISPLAY_COUNT 1
namespace android {
@ -1527,7 +1529,7 @@ status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)
* Dump the layers in the purgatory
*/
const size_t purgatorySize = mLayerPurgatory.size();
const size_t purgatorySize = mLayerPurgatory.size();
snprintf(buffer, SIZE, "Purgatory state (%d entries)\n", purgatorySize);
result.append(buffer);
for (size_t i=0 ; i<purgatorySize ; i++) {
@ -1548,6 +1550,12 @@ status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)
extensions.getRenderer(),
extensions.getVersion());
result.append(buffer);
snprintf(buffer, SIZE, "EGL : %s\n",
eglQueryString(graphicPlane(0).getEGLDisplay(),
EGL_VERSION_HW_ANDROID));
result.append(buffer);
snprintf(buffer, SIZE, "EXTS: %s\n", extensions.getExtension());
result.append(buffer);