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

Commit 0d4e658b authored Oct 21, 2010 by Mathias Agopian Committed by Android Git Automerger Oct 21, 2010

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

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

Merge commit 'add9db83'

* commit 'add9db83':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number

parents 9a9849ac add9db83

opengl/libagl/egl.cpp

+1 −1

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

opengl/libagl/state.cpp

+1 −1

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