OSDN Git Service

am 29bdde08: am 2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7...
authorJesse Hall <jessehall@google.com>
Tue, 16 Apr 2013 21:33:32 +0000 (14:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Apr 2013 21:33:32 +0000 (14:33 -0700)
commit33098d5643344154a6f77089e0671788763e5883
tree77715bd099a392b11c834681869f3c9d8f081087
parentc1c27655ee345b06558fe0992b8e1a3e10e2d525
parent29bdde08db2890f4197ae7f2b253f251468980ab
am 29bdde08: am 2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev

* commit '29bdde08db2890f4197ae7f2b253f251468980ab':
  Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
  Special-case glGetActiveUniformBlockName
  Special-case glGetStringi
  Special-case glMapBufferRange
  Special-case glGetBufferPointerv
  Special-case glGetUniformIndices
  Special-case glGetTransformFeedbackVarying
  Special-case glTransformFeedbackVaryings
  Add buffer object versions of several functions
  Add *int64 and GLsync types and related functions
  Add ES3 functions and constants, difficult ones commented out
  Support "const GLChar*" and "const GLenum*" types
  Minor changes to ES3 functions inherited from ES2
  Generate GLES30 class, just a clone of GLES20 for now