Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 66b5d902: am 27407208: Merge change Icf335098 into eclair

Browse Source 
Merge commit '66b5d902a29e08237f16be53a84f9c2472df8493' into eclair-mr2-plus-aosp

* commit '66b5d902a29e08237f16be53a84f9c2472df8493':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
This commit is contained in:
Mathias Agopian
2009-11-13 09:26:24 -08:00
committed by Android Git Automerger
parent adf3893983 66b5d902a2
commit da5e90bee4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opengl/libagl/egl.cpp
View File

@@ -876,7 +876,7 @@ struct config_management_t {
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
static char const * const gVendorString = "Google Inc."; 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 gClientApiString = "OpenGL ES";
static char const * const gExtensionsString = static char const * const gExtensionsString =
"EGL_KHR_image_base " "EGL_KHR_image_base "

2
opengl/libagl/state.cpp
View File

@@ -37,7 +37,7 @@ namespace android {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static char const * const gVendorString = "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 gVersionString = "OpenGL ES-CM 1.0";
static char const * const gExtensionsString = static char const * const gExtensionsString =
"GL_OES_byte_coordinates " // OK "GL_OES_byte_coordinates " // OK