diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-30 13:57:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 13:57:46 -0800 |
| commit | b665687a55eef67397115188a5ed76c53b267403 (patch) | |
| tree | ef6074890443d6cad8d1fb5470532148ae2d9a74 /opengl | |
| parent | f40e91c77ef32578554ced2ae28b585cf8e7f876 (diff) | |
| parent | e2970700e921da4226061988a6e8953b1fbfb5a9 (diff) | |
| download | frameworks_base-b665687a55eef67397115188a5ed76c53b267403.zip frameworks_base-b665687a55eef67397115188a5ed76c53b267403.tar.gz frameworks_base-b665687a55eef67397115188a5ed76c53b267403.tar.bz2 | |
am e2970700: am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit 'e2970700e921da4226061988a6e8953b1fbfb5a9':
add a way to access the version string of the h/w implementation of EGL
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 8 | ||||
| -rw-r--r-- | opengl/specs/README | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index a63d5b0..2b0ed5d 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -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); } diff --git a/opengl/specs/README b/opengl/specs/README index 2fa2587..16b278f 100644 --- a/opengl/specs/README +++ b/opengl/specs/README @@ -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) |