diff options
| author | Mathias Agopian <mathias@google.com> | 2013-03-29 23:31:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-29 23:31:23 +0000 |
| commit | 86e392e9b3b92e3a58d2fb65eef1552108941a76 (patch) | |
| tree | 75428a5b9f45ae1ac101532bbbfd35382249c6b7 /opengl/libs | |
| parent | 7fd5ef3ecad09e71756720bc0666cd4552508d9c (diff) | |
| parent | ca08833d5ea99130797e10ad68a651b50e99da74 (diff) | |
| download | frameworks_native-86e392e9b3b92e3a58d2fb65eef1552108941a76.zip frameworks_native-86e392e9b3b92e3a58d2fb65eef1552108941a76.tar.gz frameworks_native-86e392e9b3b92e3a58d2fb65eef1552108941a76.tar.bz2 | |
Merge "don't use compile-time configuration of libgui as much as possible" into jb-mr2-dev
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 50b08b0..1be4961 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -52,8 +52,6 @@ using namespace android; // ---------------------------------------------------------------------------- -#define EGL_VERSION_HW_ANDROID 0x3143 - namespace android { struct extention_map_t { @@ -1021,12 +1019,29 @@ const char* eglQueryString(EGLDisplay dpy, EGLint name) return dp->getExtensionString(); case EGL_CLIENT_APIS: return dp->getClientApiString(); - case EGL_VERSION_HW_ANDROID: - return dp->disp.queryString.version; } return setError(EGL_BAD_PARAMETER, (const char *)0); } +EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name) +{ + clearError(); + + const egl_display_ptr dp = validate_display(dpy); + if (!dp) return (const char *) NULL; + + switch (name) { + case EGL_VENDOR: + return dp->disp.queryString.vendor; + case EGL_VERSION: + return dp->disp.queryString.version; + case EGL_EXTENSIONS: + return dp->disp.queryString.extensions; + case EGL_CLIENT_APIS: + return dp->disp.queryString.clientApi; + } + return setError(EGL_BAD_PARAMETER, (const char *)0); +} // ---------------------------------------------------------------------------- // EGL 1.1 |