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

Commit f5c7cb31 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge changes Ic344ef63,If9bb02be,Ic8f94634 

* changes:
  Symlink /system/lib/libGLESv3.so -> libGLESv2.so
  Add ES3 support to libGLESv2 and tracing tools
  Import OpenGL ES 3.0 headers from Khronos SVN
parents 751402c8 5ea4c730

opengl/include/GLES2/gl2.h

+1 −2
Original line number Diff line number Diff line 
#ifndef __gl2_h_

#define __gl2_h_



/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */

/* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */



#include <GLES2/gl2platform.h>
@@ -431,7 +431,6 @@ typedef khronos_ssize_t GLsizeiptr; 
#define GL_RGB5_A1                        0x8057

#define GL_RGB565                         0x8D62

#define GL_DEPTH_COMPONENT16              0x81A5

#define GL_STENCIL_INDEX                  0x1901

#define GL_STENCIL_INDEX8                 0x8D48



#define GL_RENDERBUFFER_WIDTH             0x8D42

opengl/include/GLES3/gl3.h

0 → 100644
+1061 −0

File added.

Preview size limit exceeded, changes collapsed.

opengl/include/GLES3/gl3ext.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#ifndef __gl3ext_h_

#define __gl3ext_h_



/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */



/*

 * This document is licensed under the SGI Free Software B License Version

 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .

 */



/* OpenGL ES 3 Extensions

 *

 * After an OES extension's interactions with OpenGl ES 3.0 have been documented,

 * its tokens and function definitions should be added to this file in a manner

 * that does not conflict with gl2ext.h or gl3.h.

 *

 * Tokens and function definitions for extensions that have become standard

 * features in OpenGL ES 3.0 will not be added to this file.

 *

 * Applications using OpenGL-ES-2-only extensions should include gl2ext.h

 */



#endif /* __gl3ext_h_ */

opengl/include/GLES3/gl3platform.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef __gl3platform_h_

#define __gl3platform_h_



/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */



/*

 * This document is licensed under the SGI Free Software B License Version

 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .

 */



/* Platform-specific types and definitions for OpenGL ES 3.X  gl3.h

 *

 * Adopters may modify khrplatform.h and this file to suit their platform.

 * You are encouraged to submit all modifications to the Khronos group so that

 * they can be included in future versions of this file.  Please submit changes

 * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)

 * by filing a bug against product "OpenGL-ES" component "Registry".

 */



#include <KHR/khrplatform.h>



#ifndef GL_APICALL

#define GL_APICALL  KHRONOS_APICALL

#endif



#ifndef GL_APIENTRY

#define GL_APIENTRY KHRONOS_APIENTRY

#endif



#endif /* __gl3platform_h_ */

opengl/include/MODULE_LICENSE_MIT

0 → 100644
+0 −0

Empty file added.