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