summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-11-13 09:26:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-13 09:26:24 -0800
commitda5e90bee443129511e231e9078a134626b87541 (patch)
treec13da13b0493a220b9dee63c4345b9513736444f /opengl
parentadf38939836ee1d1f5967fc45d02e07117f44009 (diff)
parent66b5d902a29e08237f16be53a84f9c2472df8493 (diff)
downloadframeworks_base-da5e90bee443129511e231e9078a134626b87541.zip
frameworks_base-da5e90bee443129511e231e9078a134626b87541.tar.gz
frameworks_base-da5e90bee443129511e231e9078a134626b87541.tar.bz2
am 66b5d902: am 27407208: Merge change Icf335098 into eclair
Merge commit '66b5d902a29e08237f16be53a84f9c2472df8493' into eclair-mr2-plus-aosp * commit '66b5d902a29e08237f16be53a84f9c2472df8493': fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/egl.cpp2
-rw-r--r--opengl/libagl/state.cpp2
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