OSDN Git Service

Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f...
authorJesse Hall <jessehall@google.com>
Tue, 16 Apr 2013 21:29:39 +0000 (21:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 Apr 2013 21:29:39 +0000 (21:29 +0000)
commit2f67faeb801dd6eb8fff8f8aab3843f2532c941d
tree012e5295a4f855abb7aa904bd264cd9058245ab4
parent883daf6eed36c11a7cb458f07a88e7a9cea29c27
parentc0d184b8c1002098138f65e5cd2d9b1fb3da8bb1
Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev

* changes:
  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