From: Jesse Hall Date: Tue, 16 Apr 2013 21:29:39 +0000 (+0000) Subject: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f... X-Git-Tag: android-x86-4.4-r1~115^2~5^2~24 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2f67faeb;p=android-x86%2Fframeworks-native.git 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 --- 2f67faeb801dd6eb8fff8f8aab3843f2532c941d