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

Commit 385d9914 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

Merge commit 'da5e90bee443129511e231e9078a134626b87541'

* commit 'da5e90bee443129511e231e9078a134626b87541':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
parents 28e25a7d c656e036

opengl/libagl/egl.cpp

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

opengl/libagl/state.cpp

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