diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 14:04:24 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 14:04:24 -0800 |
| commit | 43aa2b1cbf7a03e248e10f4d0fec0463257cd52d (patch) | |
| tree | 419be3db269033df1a79ef96e10fe15be35ce27d /opengl | |
| parent | 0bb03408de8886e8d17013219967d42fb9c8cf8c (diff) | |
| download | frameworks_native-43aa2b1cbf7a03e248e10f4d0fec0463257cd52d.zip frameworks_native-43aa2b1cbf7a03e248e10f4d0fec0463257cd52d.tar.gz frameworks_native-43aa2b1cbf7a03e248e10f4d0fec0463257cd52d.tar.bz2 | |
auto import from //depot/cupcake/@132589
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 6 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 5b90bf0..1446fb2 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -463,8 +463,6 @@ struct config_management_t { // ---------------------------------------------------------------------------- -#define VERSION_MAJOR 1 -#define VERSION_MINOR 2 static char const * const gVendorString = "Google Inc."; static char const * const gVersionString = "1.2 Android Driver"; static char const * const gClientApiString = "OpenGL ES"; @@ -1004,8 +1002,8 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) } if (res == EGL_TRUE) { - if (major != NULL) *major = VERSION_MAJOR; - if (minor != NULL) *minor = VERSION_MINOR; + if (major != NULL) *major = 1; + if (minor != NULL) *minor = 2; } return res; } diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 687c8bc..e35773e 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -50,8 +50,8 @@ namespace android { // ---------------------------------------------------------------------------- -#define VERSION_MAJOR 1 -#define VERSION_MINOR 4 +#define VERSION_MINOR 1 +#define VERSION_MAJOR 4 static char const * const gVendorString = "Android"; static char const * const gVersionString = "1.31 Android META-EGL"; static char const * const gClientApiString = "OpenGL ES"; @@ -648,8 +648,8 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) } if (res == EGL_TRUE) { - if (major != NULL) *major = VERSION_MAJOR; - if (minor != NULL) *minor = VERSION_MINOR; + if (major != NULL) *major = 1; + if (minor != NULL) *minor = 2; return EGL_TRUE; } return setError(EGL_NOT_INITIALIZED, EGL_FALSE); |