diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-13 10:51:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-13 10:51:07 -0800 |
| commit | 17c50b242790228fd311895dec01880798c21cfa (patch) | |
| tree | 4b825d0aea2c2794b0363fb45e8d58d1fc5b1bce /opengl | |
| parent | bc4d75bc64c0d76da3993f305d7e4e33074bd003 (diff) | |
| parent | da5e90bee443129511e231e9078a134626b87541 (diff) | |
| download | frameworks_base-17c50b242790228fd311895dec01880798c21cfa.zip frameworks_base-17c50b242790228fd311895dec01880798c21cfa.tar.gz frameworks_base-17c50b242790228fd311895dec01880798c21cfa.tar.bz2 | |
am da5e90be: am 66b5d902: am 27407208: Merge change Icf335098 into eclair
Merge commit 'da5e90bee443129511e231e9078a134626b87541'
* commit 'da5e90bee443129511e231e9078a134626b87541':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/libagl/state.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 8cfa084..81864bd 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -876,7 +876,7 @@ 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 gVersionString = "1.2 Android Driver 1.1.0"; static char const * const gClientApiString = "OpenGL ES"; static char const * const gExtensionsString = "EGL_KHR_image_base " diff --git a/opengl/libagl/state.cpp b/opengl/libagl/state.cpp index a59b3b0..0f1f27d 100644 --- a/opengl/libagl/state.cpp +++ b/opengl/libagl/state.cpp @@ -37,7 +37,7 @@ namespace android { // ---------------------------------------------------------------------------- static char const * const gVendorString = "Android"; -static char const * const gRendererString = "Android PixelFlinger 1.1"; +static char const * const gRendererString = "Android PixelFlinger 1.2"; static char const * const gVersionString = "OpenGL ES-CM 1.0"; static char const * const gExtensionsString = "GL_OES_byte_coordinates " // OK |