diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-19 18:26:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 18:26:28 -0700 |
| commit | add9db83fdbf939f0610f8b357788fd3e8ad9ab5 (patch) | |
| tree | 1620dd0fb8ee465cc2c0ff1425db88624f204786 /opengl | |
| parent | 62ad0db62393073a8cda9b21e4ae1506954c10a5 (diff) | |
| parent | f4cd9be0390135269e22e42fd2e1fe61fdcf9863 (diff) | |
| download | frameworks_base-add9db83fdbf939f0610f8b357788fd3e8ad9ab5.zip frameworks_base-add9db83fdbf939f0610f8b357788fd3e8ad9ab5.tar.gz frameworks_base-add9db83fdbf939f0610f8b357788fd3e8ad9ab5.tar.bz2 | |
am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp
* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
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 460b74f..43fece2 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -840,7 +840,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 1.1.0"; +static char const * const gVersionString = "1.2 Android Driver 1.2.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 a0f720a..8b4136a 100644 --- a/opengl/libagl/state.cpp +++ b/opengl/libagl/state.cpp @@ -33,7 +33,7 @@ namespace android { // ---------------------------------------------------------------------------- static char const * const gVendorString = "Android"; -static char const * const gRendererString = "Android PixelFlinger 1.3"; +static char const * const gRendererString = "Android PixelFlinger 1.4"; static char const * const gVersionString = "OpenGL ES-CM 1.0"; static char const * const gExtensionsString = "GL_OES_byte_coordinates " // OK |