Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309be713 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

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

Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp

* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
parents 2758ba9e 1aedd561

opengl/libagl/egl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 "

opengl/libagl/state.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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