diff options
| author | 2010-10-19 18:23:19 -0700 | |
|---|---|---|
| committer | 2010-10-19 18:23:19 -0700 | |
| commit | f4cd9be0390135269e22e42fd2e1fe61fdcf9863 (patch) | |
| tree | 096e16cc6479a27ca498df6411cc508c08722dab | |
| parent | 6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1 (diff) | |
| parent | f91bff9fd4f159aae942ce68e3de9f9151e6ffbc (diff) | |
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 163b2dbcd3a4..3fb322a9591e 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 a0f720a0d19b..8b4136a45622 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 |