diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-19 18:23:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-19 18:23:19 -0700 |
| commit | 1aedd5613e223409dafb0940cf05f2d8c31886fc (patch) | |
| tree | 2be6180be2c505895805cf583c10f2640c03b8af | |
| parent | 512445175577b3e11f30c7fc4b8879067225b12e (diff) | |
| parent | 141550bc18f670f7e7ec65fc25363da3dd35d52e (diff) | |
| download | frameworks_native-1aedd5613e223409dafb0940cf05f2d8c31886fc.zip frameworks_native-1aedd5613e223409dafb0940cf05f2d8c31886fc.tar.gz frameworks_native-1aedd5613e223409dafb0940cf05f2d8c31886fc.tar.bz2 | |
Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
| -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 163b2db..3fb322a 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 |