diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-12 19:08:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-12 19:08:01 -0800 |
| commit | ef11d0c2e45b28ef2586e7c03690d6ada48180e8 (patch) | |
| tree | 16626f22d69f9cf0bd5101a622626986d91401ac /opengl | |
| parent | 1e75deb288b06a87a75c027b23521195992016da (diff) | |
| parent | 274072089ceff6eacb9ccfb59290a18f43739c87 (diff) | |
| download | frameworks_base-ef11d0c2e45b28ef2586e7c03690d6ada48180e8.zip frameworks_base-ef11d0c2e45b28ef2586e7c03690d6ada48180e8.tar.gz frameworks_base-ef11d0c2e45b28ef2586e7c03690d6ada48180e8.tar.bz2 | |
am 27407208: Merge change Icf335098 into eclair
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-plus-aosp
* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
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 |