Merge "Add support for additional ES3 state, primarily for textures"

6 files changed, 479 insertions, 20 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/entries.in b/eclipse/plugins/com.android.ide.eclipse.gldebugger/entries.in
index 763254d..46f2797 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/entries.in
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/entries.in
@@ -13,15 +13,22 @@ void, glAlphaFuncx, GLenum func, GLclampx ref
 void, glAlphaFuncxOES, GLenum func, GLclampx ref
 void, glAttachShader, GLuint program, GLuint shader
 void, glBeginPerfMonitorAMD, GLuint monitor
+void, glBeginQuery, GLenum target, GLuint id
 void, glBeginQueryEXT, GLenum target, GLuint id
+void, glBeginTransformFeedback, GLenum primitiveMode
 void, glBindAttribLocation, GLuint program, GLuint index, const GLchar* name
 void, glBindBuffer, GLenum target, GLuint buffer
+void, glBindBufferBase, GLenum target, GLuint index, GLuint buffer
+void, glBindBufferRange, GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size
 void, glBindFramebuffer, GLenum target, GLuint framebuffer
 void, glBindFramebufferOES, GLenum target, GLuint framebuffer
 void, glBindProgramPipelineEXT, GLuint pipeline
 void, glBindRenderbuffer, GLenum target, GLuint renderbuffer
 void, glBindRenderbufferOES, GLenum target, GLuint renderbuffer
+void, glBindSampler, GLuint unit, GLuint sampler
 void, glBindTexture, GLenum target, GLuint texture
+void, glBindTransformFeedback, GLenum target, GLuint id
+void, glBindVertexArray, GLuint array
 void, glBindVertexArrayOES, GLuint array
 void, glBlendColor, GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha
 void, glBlendEquation,  GLenum mode
@@ -31,12 +38,17 @@ void, glBlendEquationSeparateOES, GLenum modeRGB, GLenum modeAlpha
 void, glBlendFunc, GLenum sfactor, GLenum dfactor
 void, glBlendFuncSeparate, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha
 void, glBlendFuncSeparateOES, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha
+void, glBlitFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter
 void, glBlitFramebufferANGLE, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter
 void, glBufferData, GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage
 void, glBufferSubData, GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data
 GLenum, glCheckFramebufferStatus, GLenum target
 GLenum, glCheckFramebufferStatusOES, GLenum target
 void, glClear, GLbitfield mask
+void, glClearBufferfi, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil
+void, glClearBufferfv, GLenum buffer, GLint drawbuffer, const GLfloat* value
+void, glClearBufferiv, GLenum buffer, GLint drawbuffer, const GLint* value
+void, glClearBufferuiv, GLenum buffer, GLint drawbuffer, const GLuint* value
 void, glClearColor, GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha
 void, glClearColorx, GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha
 void, glClearColorxOES, GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha
@@ -46,6 +58,7 @@ void, glClearDepthx, GLclampx depth
 void, glClearDepthxOES, GLclampx depth
 void, glClearStencil, GLint s
 void, glClientActiveTexture, GLenum texture
+GLenum, glClientWaitSync, GLsync sync, GLbitfield flags, GLuint64 timeout
 void, glClipPlanef, GLenum plane, const GLfloat* equation
 void, glClipPlanefIMG, GLenum p, const GLfloat* eqn
 void, glClipPlanefOES, GLenum plane, const GLfloat* equation
@@ -60,11 +73,15 @@ void, glColorMask, GLboolean red, GLboolean green, GLboolean blue, GLboolean alp
 void, glColorPointer, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer
 void, glCompileShader, GLuint shader
 void, glCompressedTexImage2D, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data
+void, glCompressedTexImage3D, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data
 void, glCompressedTexImage3DOES, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data
 void, glCompressedTexSubImage2D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data
+void, glCompressedTexSubImage3D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data
 void, glCompressedTexSubImage3DOES, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data
+void, glCopyBufferSubData, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size
 void, glCopyTexImage2D, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border
 void, glCopyTexSubImage2D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height
+void, glCopyTexSubImage3D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height
 void, glCopyTexSubImage3DOES, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height
 void, glCoverageMaskNV, GLboolean mask
 void, glCoverageOperationNV, GLenum operation
@@ -80,11 +97,16 @@ void, glDeleteFramebuffersOES, GLsizei n, const GLuint* framebuffers
 void, glDeletePerfMonitorsAMD, GLsizei n, GLuint* monitors
 void, glDeleteProgram, GLuint program
 void, glDeleteProgramPipelinesEXT, GLsizei n, const GLuint* pipelines
+void, glDeleteQueries, GLsizei n, const GLuint* ids
 void, glDeleteQueriesEXT, GLsizei n, const GLuint* ids
 void, glDeleteRenderbuffers, GLsizei n, const GLuint* renderbuffers
 void, glDeleteRenderbuffersOES, GLsizei n, const GLuint* renderbuffers
+void, glDeleteSamplers, GLsizei count, const GLuint* samplers
 void, glDeleteShader, GLuint shader
+void, glDeleteSync, GLsync sync
 void, glDeleteTextures, GLsizei n, const GLuint* textures
+void, glDeleteTransformFeedbacks, GLsizei n, const GLuint* ids
+void, glDeleteVertexArrays, GLsizei n, const GLuint* arrays
 void, glDeleteVertexArraysOES, GLsizei n, const GLuint* arrays
 void, glDepthFunc, GLenum func
 void, glDepthMask, GLboolean flag
@@ -99,8 +121,12 @@ void, glDisableDriverControlQCOM, GLuint driverControl
 void, glDisableVertexAttribArray, GLuint index
 void, glDiscardFramebufferEXT, GLenum target, GLsizei numAttachments, const GLenum* attachments
 void, glDrawArrays, GLenum mode, GLint first, GLsizei count
+void, glDrawArraysInstanced, GLenum mode, GLint first, GLsizei count, GLsizei instanceCount
+void, glDrawBuffers, GLsizei n, const GLenum* bufs
 void, glDrawBuffersNV, GLsizei n, const GLenum* bufs
 void, glDrawElements, GLenum mode, GLsizei count, GLenum type, const GLvoid* indices
+void, glDrawElementsInstanced, GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount
+void, glDrawRangeElements, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices
 void, glDrawTexfOES, GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height
 void, glDrawTexfvOES, const GLfloat* coords
 void, glDrawTexiOES, GLint x, GLint y, GLint z, GLint width, GLint height
@@ -116,8 +142,10 @@ void, glEnableClientState, GLenum array
 void, glEnableDriverControlQCOM, GLuint driverControl
 void, glEnableVertexAttribArray, GLuint index
 void, glEndPerfMonitorAMD, GLuint monitor
+void, glEndQuery, GLenum target
 void, glEndQueryEXT, GLenum target
 void, glEndTilingQCOM, GLbitfield preserveMask
+void, glEndTransformFeedback, void
 void, glExtGetBufferPointervQCOM, GLenum target, GLvoid** params
 void, glExtGetBuffersQCOM, GLuint* buffers, GLint maxBuffers, GLint* numBuffers
 void, glExtGetFramebuffersQCOM, GLuint* framebuffers, GLint maxFramebuffers, GLint* numFramebuffers
@@ -130,9 +158,11 @@ void, glExtGetTexSubImageQCOM, GLenum target, GLint level, GLint xoffset, GLint
 void, glExtGetTexturesQCOM, GLuint* textures, GLint maxTextures, GLint* numTextures
 GLboolean, glExtIsProgramBinaryQCOM, GLuint program
 void, glExtTexObjectStateOverrideiQCOM, GLenum target, GLenum pname, GLint param
+GLsync, glFenceSync, GLenum condition, GLbitfield flags
 void, glFinish, void
 void, glFinishFenceNV, GLuint fence
 void, glFlush, void
+void, glFlushMappedBufferRange, GLenum target, GLintptr offset, GLsizeiptr length
 void, glFogf, GLenum pname, GLfloat param
 void, glFogfv, GLenum pname, const GLfloat* params
 void, glFogx, GLenum pname, GLfixed param
@@ -146,6 +176,7 @@ void, glFramebufferTexture2DMultisampleEXT, GLenum target, GLenum attachment, GL
 void, glFramebufferTexture2DMultisampleIMG, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples
 void, glFramebufferTexture2DOES, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level
 void, glFramebufferTexture3DOES, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset
+void, glFramebufferTextureLayer, GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer
 void, glFrontFace, GLenum mode
 void, glFrustumf, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar
 void, glFrustumfOES, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar
@@ -157,20 +188,29 @@ void, glGenFramebuffers, GLsizei n, GLuint* framebuffers
 void, glGenFramebuffersOES, GLsizei n, GLuint* framebuffers
 void, glGenPerfMonitorsAMD, GLsizei n, GLuint* monitors
 void, glGenProgramPipelinesEXT, GLsizei n, GLuint* pipelines
+void, glGenQueries, GLsizei n, GLuint* ids
 void, glGenQueriesEXT, GLsizei n, GLuint* ids
 void, glGenRenderbuffers, GLsizei n, GLuint* renderbuffers
 void, glGenRenderbuffersOES, GLsizei n, GLuint* renderbuffers
+void, glGenSamplers, GLsizei count, GLuint* samplers
 void, glGenTextures, GLsizei n, GLuint* textures
+void, glGenTransformFeedbacks, GLsizei n, GLuint* ids
+void, glGenVertexArrays, GLsizei n, GLuint* arrays
 void, glGenVertexArraysOES, GLsizei n, GLuint* arrays
 void, glGenerateMipmap, GLenum target
 void, glGenerateMipmapOES, GLenum target
 void, glGetActiveAttrib, GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name
 void, glGetActiveUniform, GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name
+void, glGetActiveUniformBlockName, GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName
+void, glGetActiveUniformBlockiv, GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params
+void, glGetActiveUniformsiv, GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params
 void, glGetAttachedShaders, GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders
-int, glGetAttribLocation, GLuint program, const GLchar* name
+GLint, glGetAttribLocation, GLuint program, const GLchar* name
 void, glGetBooleanv, GLenum pname, GLboolean* params
+void, glGetBufferParameteri64v, GLenum target, GLenum pname, GLint64* params
 void, glGetBufferParameteriv, GLenum target, GLenum pname, GLint* params
-void, glGetBufferPointervOES, GLenum target, GLenum pname, GLvoid** params
+void, glGetBufferPointerv, GLenum target, GLenum pname, GLvoid** params
+void, glGetBufferPointervOES, GLenum target, GLenum pname, GLvoid**  params
 void, glGetClipPlanef, GLenum pname, GLfloat eqn[4]
 void, glGetClipPlanefOES, GLenum pname, GLfloat eqn[4]
 void, glGetClipPlanex, GLenum pname, GLfixed eqn[4]
@@ -182,10 +222,15 @@ void, glGetFenceivNV, GLuint fence, GLenum pname, GLint* params
 void, glGetFixedv, GLenum pname, GLfixed* params
 void, glGetFixedvOES, GLenum pname, GLfixed* params
 void, glGetFloatv, GLenum pname, GLfloat* params
+GLint, glGetFragDataLocation, GLuint program, const GLchar* name
 void, glGetFramebufferAttachmentParameteriv, GLenum target, GLenum attachment, GLenum pname, GLint* params
 void, glGetFramebufferAttachmentParameterivOES, GLenum target, GLenum attachment, GLenum pname, GLint* params
 GLenum, glGetGraphicsResetStatusEXT, void
+void, glGetInteger64i_v, GLenum target, GLuint index, GLint64* data
+void, glGetInteger64v, GLenum pname, GLint64* params
+void, glGetIntegeri_v, GLenum target, GLuint index, GLint* data
 void, glGetIntegerv, GLenum pname, GLint* params
+void, glGetInternalformativ, GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params
 void, glGetLightfv, GLenum light, GLenum pname, GLfloat* params
 void, glGetLightxv, GLenum light, GLenum pname, GLfixed* params
 void, glGetLightxvOES, GLenum light, GLenum pname, GLfixed* params
@@ -200,20 +245,27 @@ void, glGetPerfMonitorCountersAMD, GLuint group, GLint* numCounters, GLint* maxA
 void, glGetPerfMonitorGroupStringAMD, GLuint group, GLsizei bufSize, GLsizei* length, GLchar* groupString
 void, glGetPerfMonitorGroupsAMD, GLint* numGroups, GLsizei groupsSize, GLuint* groups
 void, glGetPointerv, GLenum pname, GLvoid** params
+void, glGetProgramBinary, GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary
 void, glGetProgramBinaryOES, GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary
 void, glGetProgramInfoLog, GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog
 void, glGetProgramPipelineInfoLogEXT, GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar* infoLog
 void, glGetProgramPipelineivEXT, GLuint pipeline, GLenum pname, GLint* params
 void, glGetProgramiv, GLuint program, GLenum pname, GLint* params
+void, glGetQueryObjectuiv, GLuint id, GLenum pname, GLuint* params
 void, glGetQueryObjectuivEXT, GLuint id, GLenum pname, GLuint* params
+void, glGetQueryiv, GLenum target, GLenum pname, GLint* params
 void, glGetQueryivEXT, GLenum target, GLenum pname, GLint* params
 void, glGetRenderbufferParameteriv, GLenum target, GLenum pname, GLint* params
 void, glGetRenderbufferParameterivOES, GLenum target, GLenum pname, GLint* params
+void, glGetSamplerParameterfv, GLuint sampler, GLenum pname, GLfloat* params
+void, glGetSamplerParameteriv, GLuint sampler, GLenum pname, GLint* params
 void, glGetShaderInfoLog, GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog
 void, glGetShaderPrecisionFormat, GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision
 void, glGetShaderSource, GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source
 void, glGetShaderiv, GLuint shader, GLenum pname, GLint* params
 const GLchar* , glGetString, GLenum name
+const GLubyte*, glGetStringi, GLenum name, GLuint index
+void, glGetSynciv, GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values
 void, glGetTexEnvfv, GLenum env, GLenum pname, GLfloat* params
 void, glGetTexEnviv, GLenum env, GLenum pname, GLint* params
 void, glGetTexEnvxv, GLenum env, GLenum pname, GLfixed* params
@@ -225,9 +277,15 @@ void, glGetTexParameterfv, GLenum target, GLenum pname, GLfloat* params
 void, glGetTexParameteriv, GLenum target, GLenum pname, GLint* params
 void, glGetTexParameterxv, GLenum target, GLenum pname, GLfixed* params
 void, glGetTexParameterxvOES, GLenum target, GLenum pname, GLfixed* params
-int, glGetUniformLocation, GLuint program, const GLchar* name
+void, glGetTransformFeedbackVarying, GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name
+GLuint, glGetUniformBlockIndex, GLuint program, const GLchar* uniformBlockName
+void, glGetUniformIndices, GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices
+GLint, glGetUniformLocation, GLuint program, const GLchar* name
 void, glGetUniformfv, GLuint program, GLint location, GLfloat* params
 void, glGetUniformiv, GLuint program, GLint location, GLint* params
+void, glGetUniformuiv, GLuint program, GLint location, GLuint* params
+void, glGetVertexAttribIiv, GLuint index, GLenum pname, GLint* params
+void, glGetVertexAttribIuiv, GLuint index, GLenum pname, GLuint* params
 void, glGetVertexAttribPointerv, GLuint index, GLenum pname, GLvoid** pointer
 void, glGetVertexAttribfv, GLuint index, GLenum pname, GLfloat* params
 void, glGetVertexAttribiv, GLuint index, GLenum pname, GLint* params
@@ -235,6 +293,8 @@ void, glGetnUniformfvEXT, GLuint program, GLint location, GLsizei bufSize, float
 void, glGetnUniformivEXT, GLuint program, GLint location, GLsizei bufSize, GLint* params
 void, glHint, GLenum target, GLenum mode
 void, glInsertEventMarkerEXT, GLsizei length, const GLchar* marker
+void, glInvalidateFramebuffer, GLenum target, GLsizei numAttachments, const GLenum* attachments
+void, glInvalidateSubFramebuffer, GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height
 GLboolean, glIsBuffer, GLuint buffer
 GLboolean, glIsEnabled, GLenum cap
 GLboolean, glIsFenceNV, GLuint fence
@@ -242,11 +302,16 @@ GLboolean, glIsFramebuffer, GLuint framebuffer
 GLboolean, glIsFramebufferOES, GLuint framebuffer
 GLboolean, glIsProgram, GLuint program
 GLboolean, glIsProgramPipelineEXT, GLuint pipeline
+GLboolean, glIsQuery, GLuint id
 GLboolean, glIsQueryEXT, GLuint id
 GLboolean, glIsRenderbuffer, GLuint renderbuffer
 GLboolean, glIsRenderbufferOES, GLuint renderbuffer
+GLboolean, glIsSampler, GLuint sampler
 GLboolean, glIsShader, GLuint shader
+GLboolean, glIsSync, GLsync sync
 GLboolean, glIsTexture, GLuint texture
+GLboolean, glIsTransformFeedback, GLuint id
+GLboolean, glIsVertexArray, GLuint array
 GLboolean, glIsVertexArrayOES, GLuint array
 void, glLabelObjectEXT, GLenum type, GLuint object, GLsizei length, const GLchar* label
 void, glLightModelf, GLenum pname, GLfloat param
@@ -272,6 +337,7 @@ void, glLoadMatrixxOES, const GLfixed* m
 void, glLoadPaletteFromModelViewMatrixOES, void
 void, glLogicOp, GLenum opcode
 void*, glMapBufferOES, GLenum target, GLenum access
+GLvoid*, glMapBufferRange, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access
 void, glMaterialf, GLenum face, GLenum pname, GLfloat param
 void, glMaterialfv, GLenum face, GLenum pname, const GLfloat* params
 void, glMaterialx, GLenum face, GLenum pname, GLfixed param
@@ -296,6 +362,7 @@ void, glOrthof, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloa
 void, glOrthofOES, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar
 void, glOrthox, GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar
 void, glOrthoxOES, GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar
+void, glPauseTransformFeedback, void
 void, glPixelStorei, GLenum pname, GLint param
 void, glPointParameterf, GLenum pname, GLfloat param
 void, glPointParameterfv, GLenum pname, const GLfloat* params
@@ -312,7 +379,9 @@ void, glPolygonOffsetx, GLfixed factor, GLfixed units
 void, glPolygonOffsetxOES, GLfixed factor, GLfixed units
 void, glPopGroupMarkerEXT, void
 void, glPopMatrix, void
+void, glProgramBinary, GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length
 void, glProgramBinaryOES, GLuint program, GLenum binaryFormat, const GLvoid* binary, GLint length
+void, glProgramParameteri, GLuint program, GLenum pname, GLint value
 void, glProgramParameteriEXT, GLuint program, GLenum pname, GLint value
 void, glProgramUniform1fEXT, GLuint program, GLint location, GLfloat x
 void, glProgramUniform1fvEXT, GLuint program, GLint location, GLsizei count, const GLfloat* value
@@ -336,23 +405,30 @@ void, glProgramUniformMatrix4fvEXT, GLuint program, GLint location, GLsizei coun
 void, glPushGroupMarkerEXT, GLsizei length, const GLchar* marker
 void, glPushMatrix, void
 GLbitfield, glQueryMatrixxOES, GLfixed mantissa[16], GLint exponent[16]
+void, glReadBuffer, GLenum mode
 void, glReadBufferNV, GLenum mode
 void, glReadPixels, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels
 void, glReadnPixelsEXT, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void* data
 void, glReleaseShaderCompiler, void
 void, glRenderbufferStorage, GLenum target, GLenum internalformat, GLsizei width, GLsizei height
+void, glRenderbufferStorageMultisample, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height
 void, glRenderbufferStorageMultisampleANGLE, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height
 void, glRenderbufferStorageMultisampleAPPLE, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height
 void, glRenderbufferStorageMultisampleEXT, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height
 void, glRenderbufferStorageMultisampleIMG, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height
 void, glRenderbufferStorageOES, GLenum target, GLenum internalformat, GLsizei width, GLsizei height
 void, glResolveMultisampleFramebufferAPPLE, void
+void, glResumeTransformFeedback, void
 void, glRotatef, GLfloat angle, GLfloat x, GLfloat y, GLfloat z
 void, glRotatex, GLfixed angle, GLfixed x, GLfixed y, GLfixed z
 void, glRotatexOES, GLfixed angle, GLfixed x, GLfixed y, GLfixed z
 void, glSampleCoverage, GLclampf value, GLboolean invert
 void, glSampleCoveragex, GLclampx value, GLboolean invert
 void, glSampleCoveragexOES, GLclampx value, GLboolean invert
+void, glSamplerParameterf, GLuint sampler, GLenum pname, GLfloat param
+void, glSamplerParameterfv, GLuint sampler, GLenum pname, const GLfloat* param
+void, glSamplerParameteri, GLuint sampler, GLenum pname, GLint param
+void, glSamplerParameteriv, GLuint sampler, GLenum pname, const GLint* param
 void, glScalef, GLfloat x, GLfloat y, GLfloat z
 void, glScalex, GLfixed x, GLfixed y, GLfixed z
 void, glScalexOES, GLfixed x, GLfixed y, GLfixed z
@@ -385,7 +461,8 @@ void, glTexGeniOES, GLenum coord, GLenum pname, GLint param
 void, glTexGenivOES, GLenum coord, GLenum pname, const GLint* params
 void, glTexGenxOES, GLenum coord, GLenum pname, GLfixed param
 void, glTexGenxvOES, GLenum coord, GLenum pname, const GLfixed* params
-void, glTexImage2D, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels
+void, glTexImage2D, GLenum target, GLint level, GLEnum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels
+void, glTexImage3D, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels
 void, glTexImage3DOES, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels
 void, glTexParameterf, GLenum target, GLenum pname, GLfloat param
 void, glTexParameterfv, GLenum target, GLenum pname, const GLfloat* params
@@ -396,13 +473,17 @@ void, glTexParameterxOES, GLenum target, GLenum pname, GLfixed param
 void, glTexParameterxv, GLenum target, GLenum pname, const GLfixed* params
 void, glTexParameterxvOES, GLenum target, GLenum pname, const GLfixed* params
 void, glTexStorage1DEXT, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width
+void, glTexStorage2D, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height
 void, glTexStorage2DEXT, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height
+void, glTexStorage3D, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth
 void, glTexStorage3DEXT, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth
 void, glTexSubImage2D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels
+void, glTexSubImage3D, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels
 void, glTexSubImage3DOES, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels
 void, glTextureStorage1DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width
 void, glTextureStorage2DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height
 void, glTextureStorage3DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth
+void, glTransformFeedbackVaryings, GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode
 void, glTranslatef, GLfloat x, GLfloat y, GLfloat z
 void, glTranslatex, GLfixed x, GLfixed y, GLfixed z
 void, glTranslatexOES, GLfixed x, GLfixed y, GLfixed z
@@ -410,21 +491,37 @@ void, glUniform1f, GLint location, GLfloat x
 void, glUniform1fv, GLint location, GLsizei count, const GLfloat* v
 void, glUniform1i, GLint location, GLint x
 void, glUniform1iv, GLint location, GLsizei count, const GLint* v
+void, glUniform1ui, GLint location, GLuint v0
+void, glUniform1uiv, GLint location, GLsizei count, const GLuint* value
 void, glUniform2f, GLint location, GLfloat x, GLfloat y
 void, glUniform2fv, GLint location, GLsizei count, const GLfloat* v
 void, glUniform2i, GLint location, GLint x, GLint y
 void, glUniform2iv, GLint location, GLsizei count, const GLint* v
+void, glUniform2ui, GLint location, GLuint v0, GLuint v1
+void, glUniform2uiv, GLint location, GLsizei count, const GLuint* value
 void, glUniform3f, GLint location, GLfloat x, GLfloat y, GLfloat z
 void, glUniform3fv, GLint location, GLsizei count, const GLfloat* v
 void, glUniform3i, GLint location, GLint x, GLint y, GLint z
 void, glUniform3iv, GLint location, GLsizei count, const GLint* v
+void, glUniform3ui, GLint location, GLuint v0, GLuint v1, GLuint v2
+void, glUniform3uiv, GLint location, GLsizei count, const GLuint* value
 void, glUniform4f, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w
 void, glUniform4fv, GLint location, GLsizei count, const GLfloat* v
 void, glUniform4i, GLint location, GLint x, GLint y, GLint z, GLint w
 void, glUniform4iv, GLint location, GLsizei count, const GLint* v
+void, glUniform4ui, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3
+void, glUniform4uiv, GLint location, GLsizei count, const GLuint* value
+void, glUniformBlockBinding, GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding
 void, glUniformMatrix2fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix2x3fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix2x4fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
 void, glUniformMatrix3fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix3x2fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix3x4fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
 void, glUniformMatrix4fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix4x2fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+void, glUniformMatrix4x3fv, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value
+GLboolean, glUnmapBuffer, GLenum target
 GLboolean, glUnmapBufferOES, GLenum target
 void, glUseProgram, GLuint program
 void, glUseProgramStagesEXT, GLuint pipeline, GLbitfield stages, GLuint program
@@ -438,8 +535,15 @@ void, glVertexAttrib3f, GLuint indx, GLfloat x, GLfloat y, GLfloat z
 void, glVertexAttrib3fv, GLuint indx, const GLfloat* values
 void, glVertexAttrib4f, GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w
 void, glVertexAttrib4fv, GLuint indx, const GLfloat* values
+void, glVertexAttribDivisor, GLuint index, GLuint divisor
+void, glVertexAttribI4i, GLuint index, GLint x, GLint y, GLint z, GLint w
+void, glVertexAttribI4iv, GLuint index, const GLint* v
+void, glVertexAttribI4ui, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w
+void, glVertexAttribI4uiv, GLuint index, const GLuint* v
+void, glVertexAttribIPointer, GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer
 void, glVertexAttribPointer, GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr
 void, glVertexAttribPointerData, GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr, GLuint minIndex, GLuint maxIndex
 void, glVertexPointer, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer
 void, glViewport, GLint x, GLint y, GLsizei width, GLsizei height
+void, glWaitSync, GLsync sync, GLbitfield flags, GLuint64 timeout
 void, glWeightPointerOES, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLEnum.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLEnum.java
index 97c04ca..ceb9f1a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLEnum.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLEnum.java
@@ -19,7 +19,7 @@
 package com.android.ide.eclipse.gltrace;
 
 public enum GLEnum {
-    GL_POINTS(0x0000),
+    GL_NONE(0x0000),
     GL_LINES(0x0001),
     GL_LINE_LOOP(0x0002),
     GL_LINE_STRIP(0x0003),
@@ -307,7 +307,6 @@ public enum GLEnum {
     GL_POINT_FADE_THRESHOLD_SIZE(0x8128),
     GL_POINT_DISTANCE_ATTENUATION(0x8129),
     GL_CLAMP_TO_EDGE(0x812F),
-    GL_TEXTURE_MAX_LEVEL_APPLE(0x813D),
     GL_GENERATE_MIPMAP(0x8191),
     GL_GENERATE_MIPMAP_HINT(0x8192),
     GL_DEPTH_COMPONENT16(0x81A5),
@@ -488,8 +487,6 @@ public enum GLEnum {
     GL_MATRIX_INDEX_ARRAY_TYPE(0x8847),
     GL_MATRIX_INDEX_ARRAY_STRIDE(0x8848),
     GL_MATRIX_INDEX_ARRAY_POINTER(0x8849),
-    GL_TEXTURE_COMPARE_MODE_EXT(0x884C),
-    GL_TEXTURE_COMPARE_FUNC_EXT(0x884D),
     GL_COMPARE_REF_TO_TEXTURE_EXT(0x884E),
     GL_CURRENT_QUERY_EXT(0x8865),
     GL_QUERY_RESULT_EXT(0x8866),
@@ -718,21 +715,303 @@ public enum GLEnum {
     GL_VERTEX_ARRAY_OBJECT_EXT(0x9154),
     GL_SHADER_BINARY_DMP(0x9250),
     GL_BGRA8_EXT(0x93A1),
+
+    // Constants defined by ES3
+    GL_READ_BUFFER(0x0C02),
+    GL_PACK_ROW_LENGTH(0x0D02),
+    GL_PACK_SKIP_ROWS(0x0D03),
+    GL_PACK_SKIP_PIXELS(0x0D04),
+    GL_COLOR(0x1800),
+    GL_DEPTH(0x1801),
+    GL_STENCIL(0x1802),
+    GL_RED(0x1903),
+    GL_RGB10_A2(0x8059),
+    GL_UNPACK_SKIP_IMAGES(0x806D),
+    GL_UNPACK_IMAGE_HEIGHT(0x806E),
+    GL_UNSIGNED_INT_2_10_10_10_REV(0x8368),
+    GL_MAX_ELEMENTS_VERTICES(0x80E8),
+    GL_MAX_ELEMENTS_INDICES(0x80E9),
+    GL_TEXTURE_MIN_LOD(0x813A),
+    GL_TEXTURE_MAX_LOD(0x813B),
+    GL_TEXTURE_BASE_LEVEL(0x813C),
+    GL_TEXTURE_MAX_LEVEL(0x813D),
+    GL_MIN(0x8007),
+    GL_MAX(0x8008),
+    GL_MAX_TEXTURE_LOD_BIAS(0x84FD),
+    GL_TEXTURE_COMPARE_MODE(0x884C),
+    GL_TEXTURE_COMPARE_FUNC(0x884D),
+    GL_CURRENT_QUERY(0x8865),
+    GL_QUERY_RESULT(0x8866),
+    GL_QUERY_RESULT_AVAILABLE(0x8867),
+    GL_STREAM_READ(0x88E1),
+    GL_STREAM_COPY(0x88E2),
+    GL_STATIC_READ(0x88E5),
+    GL_STATIC_COPY(0x88E6),
+    GL_DYNAMIC_READ(0x88E9),
+    GL_DYNAMIC_COPY(0x88EA),
+    GL_MAX_DRAW_BUFFERS(0x8824),
+    GL_DRAW_BUFFER0(0x8825),
+    GL_DRAW_BUFFER1(0x8826),
+    GL_DRAW_BUFFER2(0x8827),
+    GL_DRAW_BUFFER3(0x8828),
+    GL_DRAW_BUFFER4(0x8829),
+    GL_DRAW_BUFFER5(0x882A),
+    GL_DRAW_BUFFER6(0x882B),
+    GL_DRAW_BUFFER7(0x882C),
+    GL_DRAW_BUFFER8(0x882D),
+    GL_DRAW_BUFFER9(0x882E),
+    GL_DRAW_BUFFER10(0x882F),
+    GL_DRAW_BUFFER11(0x8830),
+    GL_DRAW_BUFFER12(0x8831),
+    GL_DRAW_BUFFER13(0x8832),
+    GL_DRAW_BUFFER14(0x8833),
+    GL_DRAW_BUFFER15(0x8834),
+    GL_MAX_FRAGMENT_UNIFORM_COMPONENTS(0x8B49),
+    GL_MAX_VERTEX_UNIFORM_COMPONENTS(0x8B4A),
+    GL_SAMPLER_2D_SHADOW(0x8B62),
+    GL_PIXEL_PACK_BUFFER(0x88EB),
+    GL_PIXEL_UNPACK_BUFFER(0x88EC),
+    GL_PIXEL_PACK_BUFFER_BINDING(0x88ED),
+    GL_PIXEL_UNPACK_BUFFER_BINDING(0x88EF),
+    GL_FLOAT_MAT2x3(0x8B65),
+    GL_FLOAT_MAT2x4(0x8B66),
+    GL_FLOAT_MAT3x2(0x8B67),
+    GL_FLOAT_MAT3x4(0x8B68),
+    GL_FLOAT_MAT4x2(0x8B69),
+    GL_FLOAT_MAT4x3(0x8B6A),
+    GL_SRGB(0x8C40),
+    GL_SRGB8(0x8C41),
+    GL_SRGB8_ALPHA8(0x8C43),
+    GL_COMPARE_REF_TO_TEXTURE(0x884E),
+    GL_MAJOR_VERSION(0x821B),
+    GL_MINOR_VERSION(0x821C),
+    GL_NUM_EXTENSIONS(0x821D),
+    GL_RGBA32F(0x8814),
+    GL_RGB32F(0x8815),
+    GL_RGBA16F(0x881A),
+    GL_RGB16F(0x881B),
+    GL_VERTEX_ATTRIB_ARRAY_INTEGER(0x88FD),
+    GL_MAX_ARRAY_TEXTURE_LAYERS(0x88FF),
+    GL_MIN_PROGRAM_TEXEL_OFFSET(0x8904),
+    GL_MAX_PROGRAM_TEXEL_OFFSET(0x8905),
+    GL_MAX_VARYING_COMPONENTS(0x8B4B),
+    GL_TEXTURE_2D_ARRAY(0x8C1A),
+    GL_TEXTURE_BINDING_2D_ARRAY(0x8C1D),
+    GL_R11F_G11F_B10F(0x8C3A),
+    GL_UNSIGNED_INT_10F_11F_11F_REV(0x8C3B),
+    GL_RGB9_E5(0x8C3D),
+    GL_UNSIGNED_INT_5_9_9_9_REV(0x8C3E),
+    GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH(0x8C76),
+    GL_TRANSFORM_FEEDBACK_BUFFER_MODE(0x8C7F),
+    GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS(0x8C80),
+    GL_TRANSFORM_FEEDBACK_VARYINGS(0x8C83),
+    GL_TRANSFORM_FEEDBACK_BUFFER_START(0x8C84),
+    GL_TRANSFORM_FEEDBACK_BUFFER_SIZE(0x8C85),
+    GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN(0x8C88),
+    GL_RASTERIZER_DISCARD(0x8C89),
+    GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS(0x8C8A),
+    GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS(0x8C8B),
+    GL_INTERLEAVED_ATTRIBS(0x8C8C),
+    GL_SEPARATE_ATTRIBS(0x8C8D),
+    GL_TRANSFORM_FEEDBACK_BUFFER(0x8C8E),
+    GL_TRANSFORM_FEEDBACK_BUFFER_BINDING(0x8C8F),
+    GL_RGBA32UI(0x8D70),
+    GL_RGB32UI(0x8D71),
+    GL_RGBA16UI(0x8D76),
+    GL_RGB16UI(0x8D77),
+    GL_RGBA8UI(0x8D7C),
+    GL_RGB8UI(0x8D7D),
+    GL_RGBA32I(0x8D82),
+    GL_RGB32I(0x8D83),
+    GL_RGBA16I(0x8D88),
+    GL_RGB16I(0x8D89),
+    GL_RGBA8I(0x8D8E),
+    GL_RGB8I(0x8D8F),
+    GL_RED_INTEGER(0x8D94),
+    GL_RGB_INTEGER(0x8D98),
+    GL_RGBA_INTEGER(0x8D99),
+    GL_SAMPLER_2D_ARRAY(0x8DC1),
+    GL_SAMPLER_2D_ARRAY_SHADOW(0x8DC4),
+    GL_SAMPLER_CUBE_SHADOW(0x8DC5),
+    GL_UNSIGNED_INT_VEC2(0x8DC6),
+    GL_UNSIGNED_INT_VEC3(0x8DC7),
+    GL_UNSIGNED_INT_VEC4(0x8DC8),
+    GL_INT_SAMPLER_2D(0x8DCA),
+    GL_INT_SAMPLER_3D(0x8DCB),
+    GL_INT_SAMPLER_CUBE(0x8DCC),
+    GL_INT_SAMPLER_2D_ARRAY(0x8DCF),
+    GL_UNSIGNED_INT_SAMPLER_2D(0x8DD2),
+    GL_UNSIGNED_INT_SAMPLER_3D(0x8DD3),
+    GL_UNSIGNED_INT_SAMPLER_CUBE(0x8DD4),
+    GL_UNSIGNED_INT_SAMPLER_2D_ARRAY(0x8DD7),
+    GL_BUFFER_ACCESS_FLAGS(0x911F),
+    GL_BUFFER_MAP_LENGTH(0x9120),
+    GL_BUFFER_MAP_OFFSET(0x9121),
+    GL_DEPTH_COMPONENT32F(0x8CAC),
+    GL_DEPTH32F_STENCIL8(0x8CAD),
+    GL_FLOAT_32_UNSIGNED_INT_24_8_REV(0x8DAD),
+    GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING(0x8210),
+    GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE(0x8211),
+    GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE(0x8212),
+    GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE(0x8213),
+    GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE(0x8214),
+    GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE(0x8215),
+    GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE(0x8216),
+    GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE(0x8217),
+    GL_FRAMEBUFFER_DEFAULT(0x8218),
+    GL_FRAMEBUFFER_UNDEFINED(0x8219),
+    GL_DEPTH_STENCIL_ATTACHMENT(0x821A),
+    GL_UNSIGNED_NORMALIZED(0x8C17),
+    GL_READ_FRAMEBUFFER(0x8CA8),
+    GL_DRAW_FRAMEBUFFER(0x8CA9),
+    GL_READ_FRAMEBUFFER_BINDING(0x8CAA),
+    GL_RENDERBUFFER_SAMPLES(0x8CAB),
+    GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER(0x8CD4),
+    GL_MAX_COLOR_ATTACHMENTS(0x8CDF),
+    GL_COLOR_ATTACHMENT1(0x8CE1),
+    GL_COLOR_ATTACHMENT2(0x8CE2),
+    GL_COLOR_ATTACHMENT3(0x8CE3),
+    GL_COLOR_ATTACHMENT4(0x8CE4),
+    GL_COLOR_ATTACHMENT5(0x8CE5),
+    GL_COLOR_ATTACHMENT6(0x8CE6),
+    GL_COLOR_ATTACHMENT7(0x8CE7),
+    GL_COLOR_ATTACHMENT8(0x8CE8),
+    GL_COLOR_ATTACHMENT9(0x8CE9),
+    GL_COLOR_ATTACHMENT10(0x8CEA),
+    GL_COLOR_ATTACHMENT11(0x8CEB),
+    GL_COLOR_ATTACHMENT12(0x8CEC),
+    GL_COLOR_ATTACHMENT13(0x8CED),
+    GL_COLOR_ATTACHMENT14(0x8CEE),
+    GL_COLOR_ATTACHMENT15(0x8CEF),
+    GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE(0x8D56),
+    GL_MAX_SAMPLES(0x8D57),
+    GL_MAP_READ_BIT(0x0001),
+    GL_MAP_WRITE_BIT(0x0002),
+    GL_MAP_INVALIDATE_RANGE_BIT(0x0004),
+    GL_MAP_INVALIDATE_BUFFER_BIT(0x0008),
+    GL_MAP_FLUSH_EXPLICIT_BIT(0x0010),
+    GL_MAP_UNSYNCHRONIZED_BIT(0x0020),
+    GL_RG(0x8227),
+    GL_RG_INTEGER(0x8228),
+    GL_R8(0x8229),
+    GL_RG8(0x822B),
+    GL_R16F(0x822D),
+    GL_R32F(0x822E),
+    GL_RG16F(0x822F),
+    GL_RG32F(0x8230),
+    GL_R8I(0x8231),
+    GL_R8UI(0x8232),
+    GL_R16I(0x8233),
+    GL_R16UI(0x8234),
+    GL_R32I(0x8235),
+    GL_R32UI(0x8236),
+    GL_RG8I(0x8237),
+    GL_RG8UI(0x8238),
+    GL_RG16I(0x8239),
+    GL_RG16UI(0x823A),
+    GL_RG32I(0x823B),
+    GL_RG32UI(0x823C),
+    GL_R8_SNORM(0x8F94),
+    GL_RG8_SNORM(0x8F95),
+    GL_RGB8_SNORM(0x8F96),
+    GL_RGBA8_SNORM(0x8F97),
+    GL_SIGNED_NORMALIZED(0x8F9C),
+    GL_PRIMITIVE_RESTART_FIXED_INDEX(0x8D69),
+    GL_COPY_READ_BUFFER(0x8F36),
+    GL_COPY_WRITE_BUFFER(0x8F37),
+    GL_UNIFORM_BUFFER(0x8A11),
+    GL_UNIFORM_BUFFER_BINDING(0x8A28),
+    GL_UNIFORM_BUFFER_START(0x8A29),
+    GL_UNIFORM_BUFFER_SIZE(0x8A2A),
+    GL_MAX_VERTEX_UNIFORM_BLOCKS(0x8A2B),
+    GL_MAX_FRAGMENT_UNIFORM_BLOCKS(0x8A2D),
+    GL_MAX_COMBINED_UNIFORM_BLOCKS(0x8A2E),
+    GL_MAX_UNIFORM_BUFFER_BINDINGS(0x8A2F),
+    GL_MAX_UNIFORM_BLOCK_SIZE(0x8A30),
+    GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS(0x8A31),
+    GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS(0x8A33),
+    GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT(0x8A34),
+    GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH(0x8A35),
+    GL_ACTIVE_UNIFORM_BLOCKS(0x8A36),
+    GL_UNIFORM_TYPE(0x8A37),
+    GL_UNIFORM_SIZE(0x8A38),
+    GL_UNIFORM_NAME_LENGTH(0x8A39),
+    GL_UNIFORM_BLOCK_INDEX(0x8A3A),
+    GL_UNIFORM_OFFSET(0x8A3B),
+    GL_UNIFORM_ARRAY_STRIDE(0x8A3C),
+    GL_UNIFORM_MATRIX_STRIDE(0x8A3D),
+    GL_UNIFORM_IS_ROW_MAJOR(0x8A3E),
+    GL_UNIFORM_BLOCK_BINDING(0x8A3F),
+    GL_UNIFORM_BLOCK_DATA_SIZE(0x8A40),
+    GL_UNIFORM_BLOCK_NAME_LENGTH(0x8A41),
+    GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS(0x8A42),
+    GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES(0x8A43),
+    GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER(0x8A44),
+    GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER(0x8A46),
+    GL_MAX_VERTEX_OUTPUT_COMPONENTS(0x9122),
+    GL_MAX_FRAGMENT_INPUT_COMPONENTS(0x9125),
+    GL_MAX_SERVER_WAIT_TIMEOUT(0x9111),
+    GL_OBJECT_TYPE(0x9112),
+    GL_SYNC_CONDITION(0x9113),
+    GL_SYNC_STATUS(0x9114),
+    GL_SYNC_FLAGS(0x9115),
+    GL_SYNC_FENCE(0x9116),
+    GL_SYNC_GPU_COMMANDS_COMPLETE(0x9117),
+    GL_UNSIGNALED(0x9118),
+    GL_SIGNALED(0x9119),
+    GL_ALREADY_SIGNALED(0x911A),
+    GL_TIMEOUT_EXPIRED(0x911B),
+    GL_CONDITION_SATISFIED(0x911C),
+    GL_WAIT_FAILED(0x911D),
+    GL_SYNC_FLUSH_COMMANDS_BIT(0x00000001),
+    GL_TIMEOUT_IGNORED(0xFFFFFFFFFFFFFFFFl),
+    GL_VERTEX_ATTRIB_ARRAY_DIVISOR(0x88FE),
+    GL_ANY_SAMPLES_PASSED(0x8C2F),
+    GL_ANY_SAMPLES_PASSED_CONSERVATIVE(0x8D6A),
+    GL_SAMPLER_BINDING(0x8919),
+    GL_RGB10_A2UI(0x906F),
+    GL_TEXTURE_SWIZZLE_R(0x8E42),
+    GL_TEXTURE_SWIZZLE_G(0x8E43),
+    GL_TEXTURE_SWIZZLE_B(0x8E44),
+    GL_TEXTURE_SWIZZLE_A(0x8E45),
+    GL_GREEN(0x1904),
+    GL_BLUE(0x1905),
+    GL_INT_2_10_10_10_REV(0x8D9F),
+    GL_TRANSFORM_FEEDBACK(0x8E22),
+    GL_TRANSFORM_FEEDBACK_PAUSED(0x8E23),
+    GL_TRANSFORM_FEEDBACK_ACTIVE(0x8E24),
+    GL_TRANSFORM_FEEDBACK_BINDING(0x8E25),
+    GL_PROGRAM_BINARY_RETRIEVABLE_HINT(0x8257),
+    GL_COMPRESSED_R11_EAC(0x9270),
+    GL_COMPRESSED_SIGNED_R11_EAC(0x9271),
+    GL_COMPRESSED_RG11_EAC(0x9272),
+    GL_COMPRESSED_SIGNED_RG11_EAC(0x9273),
+    GL_COMPRESSED_RGB8_ETC2(0x9274),
+    GL_COMPRESSED_SRGB8_ETC2(0x9275),
+    GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2(0x9276),
+    GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2(0x9277),
+    GL_COMPRESSED_RGBA8_ETC2_EAC(0x9278),
+    GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC(0x9279),
+    GL_TEXTURE_IMMUTABLE_FORMAT(0x912F),
+    GL_MAX_ELEMENT_INDEX(0x8D6B),
+    GL_NUM_SAMPLE_COUNTS(0x9380),
+    GL_TEXTURE_IMMUTABLE_LEVELS(0x82DF),
+
     GL_ALL_SHADER_BITS_EXT(0xFFFFFFFF),
     ;
 
-    public final int value;
-    GLEnum(final int value) {
+    public final long value;
+    GLEnum(final long value) {
         this.value = value;
     }
 
-    private static final java.util.HashMap<Integer, GLEnum> reverseMap = new java.util.HashMap<Integer, GLEnum>();
+    private static final java.util.HashMap<Long, GLEnum> reverseMap = new java.util.HashMap<Long, GLEnum>();
     static {
         for (GLEnum e : GLEnum.values())
         reverseMap.put(e.value, e);
     }
 
-    public static GLEnum valueOf(final int value) {
+    public static GLEnum valueOf(final long value) {
         return reverseMap.get(value);
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java
index 74c6fcd..1743499 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java
@@ -209,9 +209,9 @@ public class GLState {
         IGLProperty blendSrcRgb = new GLEnumProperty(GLStateType.BLEND_SRC_RGB, GLEnum.GL_LINES);
         IGLProperty blendSrcAlpha = new GLEnumProperty(GLStateType.BLEND_SRC_ALPHA,
                 GLEnum.GL_LINES);
-        IGLProperty blendDstRgb = new GLEnumProperty(GLStateType.BLEND_DST_RGB, GLEnum.GL_POINTS);
+        IGLProperty blendDstRgb = new GLEnumProperty(GLStateType.BLEND_DST_RGB, GLEnum.GL_NONE);
         IGLProperty blendDstAlpha = new GLEnumProperty(GLStateType.BLEND_DST_ALPHA,
-                GLEnum.GL_POINTS);
+                GLEnum.GL_NONE);
         IGLProperty blendEquationRgb = new GLEnumProperty(GLStateType.BLEND_EQUATION_RGB,
                 GLEnum.GL_FUNC_ADD);
         IGLProperty blendEquationAlpha = new GLEnumProperty(GLStateType.BLEND_EQUATION_ALPHA,
@@ -260,12 +260,28 @@ public class GLState {
         IGLProperty textureUnitState = new GLListProperty(GLStateType.TEXTURE_UNITS,
                 perTextureUnitState, TEXTURE_UNIT_COUNT);
 
+        IGLProperty swizzleR = new GLEnumProperty(GLStateType.TEXTURE_SWIZZLE_R, GLEnum.GL_RED);
+        IGLProperty swizzleG = new GLEnumProperty(GLStateType.TEXTURE_SWIZZLE_G, GLEnum.GL_GREEN);
+        IGLProperty swizzleB = new GLEnumProperty(GLStateType.TEXTURE_SWIZZLE_B, GLEnum.GL_BLUE);
+        IGLProperty swizzleA = new GLEnumProperty(GLStateType.TEXTURE_SWIZZLE_A, GLEnum.GL_ALPHA);
         IGLProperty minFilter = new GLEnumProperty(GLStateType.TEXTURE_MIN_FILTER,
                 GLEnum.GL_NEAREST);
         IGLProperty magFilter = new GLEnumProperty(GLStateType.TEXTURE_MAG_FILTER,
                 GLEnum.GL_NEAREST);
         IGLProperty wrapS = new GLEnumProperty(GLStateType.TEXTURE_WRAP_S, GLEnum.GL_REPEAT);
         IGLProperty wrapT = new GLEnumProperty(GLStateType.TEXTURE_WRAP_T, GLEnum.GL_REPEAT);
+        IGLProperty wrapR = new GLEnumProperty(GLStateType.TEXTURE_WRAP_R, GLEnum.GL_REPEAT);
+        IGLProperty minLod = new GLFloatProperty(GLStateType.TEXTURE_MIN_LOD, Float.valueOf(-1000));
+        IGLProperty maxLod = new GLFloatProperty(GLStateType.TEXTURE_MAX_LOD, Float.valueOf(1000));
+        IGLProperty baseLevel = new GLIntegerProperty(GLStateType.TEXTURE_BASE_LEVEL, 0);
+        IGLProperty maxLevel = new GLIntegerProperty(GLStateType.TEXTURE_MAX_LEVEL, 1000);
+        IGLProperty cmpMode = new GLEnumProperty(GLStateType.TEXTURE_COMPARE_MODE, GLEnum.GL_NONE);
+        IGLProperty cmpFunc = new GLEnumProperty(GLStateType.TEXTURE_COMPARE_FUNC,
+                GLEnum.GL_LEQUAL);
+        IGLProperty immutableFormat = new GLBooleanProperty(GLStateType.TEXTURE_IMMUTABLE_FORMAT,
+                Boolean.FALSE);
+        IGLProperty immutableLevels = new GLIntegerProperty(GLStateType.TEXTURE_IMMUTABLE_LEVELS,
+                0);
 
         IGLProperty width = new GLIntegerProperty(GLStateType.TEXTURE_WIDTH, Integer.valueOf(-1));
         IGLProperty height = new GLIntegerProperty(GLStateType.TEXTURE_HEIGHT,
@@ -283,7 +299,14 @@ public class GLState {
                 perTextureLevelState, true);
 
         IGLProperty textureDefaultState = new GLCompositeProperty(GLStateType.PER_TEXTURE_STATE,
-                minFilter, magFilter, wrapS, wrapT, mipmapState);
+                swizzleR, swizzleG, swizzleB, swizzleA,
+                minFilter, magFilter,
+                wrapS, wrapT, wrapR,
+                minLod, maxLod,
+                baseLevel, maxLevel,
+                cmpMode, cmpFunc,
+                immutableFormat, immutableLevels,
+                mipmapState);
         GLSparseArrayProperty textures = new GLSparseArrayProperty(GLStateType.TEXTURES,
                 textureDefaultState);
         textures.add(0);
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLStateType.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLStateType.java
index 330e4f5..a0a7ce4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLStateType.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLStateType.java
@@ -119,10 +119,23 @@ public enum GLStateType {
             TEXTURE_BINDING_EXTERNAL("TEXTURE_EXTERNAL Binding"),
         TEXTURES("Textures"),
             PER_TEXTURE_STATE("Per Texture State"),
+                TEXTURE_SWIZZLE_R("Red Component Swizzle"),
+                TEXTURE_SWIZZLE_G("Green Component Swizzle"),
+                TEXTURE_SWIZZLE_B("Blue Component Swizzle"),
+                TEXTURE_SWIZZLE_A("Alpha Component Swizzle"),
                 TEXTURE_MIN_FILTER("Minification Function"),
                 TEXTURE_MAG_FILTER("Magnification Function"),
                 TEXTURE_WRAP_S("Texcoord s Wrap Mode"),
                 TEXTURE_WRAP_T("Texcoord t Wrap Mode"),
+                TEXTURE_WRAP_R("Texcoord r Wrap Mode"),
+                TEXTURE_MIN_LOD("Min Level of Detail"),
+                TEXTURE_MAX_LOD("Max Level of Detail"),
+                TEXTURE_BASE_LEVEL("Base Texture Array"),
+                TEXTURE_MAX_LEVEL("Max Texture Array Level"),
+                TEXTURE_COMPARE_MODE("Comparison Mode"),
+                TEXTURE_COMPARE_FUNC("Comparison Function"),
+                TEXTURE_IMMUTABLE_FORMAT("Size and format immutable?"),
+                TEXTURE_IMMUTABLE_LEVELS("# of levels in immutable textures"),
                 TEXTURE_MIPMAPS("Texture Mipmap State"),
                     PER_TEXTURE_LEVEL_STATE("Per Texture Level State"),
                         TEXTURE_FORMAT("Format"),
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/StateTransformFactory.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/StateTransformFactory.java
index 1a95798..fb9f227 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/StateTransformFactory.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/StateTransformFactory.java
@@ -30,11 +30,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 
 public class StateTransformFactory {
     private static final String TEXTURE_DATA_FILE_PREFIX = "tex";   //$NON-NLS-1$
     private static final String TEXTURE_DATA_FILE_SUFFIX = ".dat";  //$NON-NLS-1$
+    private static EnumSet<GLEnum> sTexParameterPnameValues;
 
     /** Construct a list of transformations to be applied for the provided OpenGL call. */
     public static List<IStateTransform> getTransformsFor(GLMessage msg) {
@@ -937,7 +939,7 @@ public class StateTransformFactory {
     private static List<IStateTransform> transformsForGlActiveTexture(GLMessage msg) {
         // void glActiveTexture(GLenum texture);
         GLEnum texture = GLEnum.valueOf(msg.getArgs(0).getIntValue(0));
-        Integer textureIndex = Integer.valueOf(texture.value - GLEnum.GL_TEXTURE0.value);
+        Integer textureIndex = Integer.valueOf((int)(texture.value - GLEnum.GL_TEXTURE0.value));
         IStateTransform transform = new PropertyChangeTransform(
                 GLPropertyAccessor.makeAccessor(msg.getContextId(),
                                                 GLStateType.TEXTURE_STATE,
@@ -1075,10 +1077,28 @@ public class StateTransformFactory {
         GLEnum pname = GLEnum.valueOf(msg.getArgs(1).getIntValue(0));
         GLEnum pvalue = GLEnum.valueOf(msg.getArgs(2).getIntValue(0));
 
-        if (pname != GLEnum.GL_TEXTURE_MIN_FILTER
-                && pname != GLEnum.GL_TEXTURE_MAG_FILTER
-                && pname != GLEnum.GL_TEXTURE_WRAP_S
-                && pname != GLEnum.GL_TEXTURE_WRAP_T) {
+        if (sTexParameterPnameValues == null) {
+            GLEnum[] pnameValues = new GLEnum[] {
+                    GLEnum.GL_TEXTURE_BASE_LEVEL,
+                    GLEnum.GL_TEXTURE_COMPARE_FUNC,
+                    GLEnum.GL_TEXTURE_COMPARE_MODE,
+                    GLEnum.GL_TEXTURE_MIN_FILTER,
+                    GLEnum.GL_TEXTURE_MAG_FILTER,
+                    GLEnum.GL_TEXTURE_MIN_LOD,
+                    GLEnum.GL_TEXTURE_MAX_LOD,
+                    GLEnum.GL_TEXTURE_MAX_LEVEL,
+                    GLEnum.GL_TEXTURE_SWIZZLE_R,
+                    GLEnum.GL_TEXTURE_SWIZZLE_G,
+                    GLEnum.GL_TEXTURE_SWIZZLE_B,
+                    GLEnum.GL_TEXTURE_SWIZZLE_A,
+                    GLEnum.GL_TEXTURE_WRAP_S,
+                    GLEnum.GL_TEXTURE_WRAP_T,
+                    GLEnum.GL_TEXTURE_WRAP_R
+            };
+            sTexParameterPnameValues = EnumSet.copyOf(Arrays.asList(pnameValues));
+        }
+
+        if (!sTexParameterPnameValues.contains(pname)) {
             throw new IllegalArgumentException(
                     String.format("Unsupported parameter (%s) for glTexParameter()", pname));
         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/TexImageTransform.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/TexImageTransform.java
index 451eb70..a88f21c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/TexImageTransform.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/transforms/TexImageTransform.java
@@ -26,6 +26,8 @@ import com.google.common.primitives.UnsignedBytes;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
 
 import javax.imageio.ImageIO;
 
@@ -99,6 +101,8 @@ public class TexImageTransform implements IStateTransform {
                 }
             } catch (IOException e) {
                 throw new RuntimeException(e);
+            } catch (RuntimeException e) {
+                throw e;
             }
         }
 
@@ -186,6 +190,9 @@ public class TexImageTransform implements IStateTransform {
                 return subImageData;
             case GL_RGB:
                 return addAlphaChannel(subImageData, width, height);
+            case GL_RED:
+            case GL_GREEN:
+            case GL_BLUE:
             case GL_ALPHA:
                 return addRGBChannels(subImageData, width, height);
             case GL_LUMINANCE:
@@ -210,11 +217,24 @@ public class TexImageTransform implements IStateTransform {
             case GL_UNSIGNED_SHORT_5_5_5_1:
                 return convertShortToUnsigned(data, 0xf800, 11, 0x07c0, 6, 0x003e, 1, 0x1, 0,
                         true);
+            case GL_FLOAT:
+                return convertFloatToUnsigned(data);
             default:
                 return data;
         }
     }
 
+   private byte[] convertFloatToUnsigned(byte[] data) {
+       byte[] unsignedData = new byte[data.length];
+       ByteBuffer floatBuffer = ByteBuffer.wrap(data);
+       for (int i = 0; i < data.length / 4; i++) {
+           float v = floatBuffer.getFloat(i);
+           byte alpha = (byte)(v * 255);
+           unsignedData[i*4 + 3] = alpha;
+       }
+       return unsignedData;
+   }
+
    private byte[] convertShortToUnsigned(byte[] shortData,
            int rmask, int rshift,
            int gmask, int gshift,