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

am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread

Browse Source 
Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp

* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
This commit is contained in:
Mathias Agopian
2010-10-19 18:26:28 -07:00
committed by Android Git Automerger
parent 62ad0db623 f4cd9be039
commit add9db83fd
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

@@ -840,7 +840,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 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 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

@@ -33,7 +33,7 @@ namespace android {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static char const * const gVendorString = "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 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