diff options
author | Siva Velusamy <vsiva@google.com> | 2012-02-13 19:08:10 -0800 |
---|---|---|
committer | Siva Velusamy <vsiva@google.com> | 2012-02-13 19:14:02 -0800 |
commit | 776dd1ccf938af0da5c5cc398887a8d060f21312 (patch) | |
tree | 30f8f63daa0bc271aadf5fb2b874bcda31d89037 /eclipse/plugins/com.android.ide.eclipse.gldebugger.tests | |
parent | e45b84524b11a826b71617d38812a97dd58bd818 (diff) | |
download | sdk-776dd1ccf938af0da5c5cc398887a8d060f21312.zip sdk-776dd1ccf938af0da5c5cc398887a8d060f21312.tar.gz sdk-776dd1ccf938af0da5c5cc398887a8d060f21312.tar.bz2 |
gltrace: Fix formatter issue with enum arguments.
Enum arguments are passed along in the protocol buffer
with an integer type. This patch fixes the formatter to
take care of this case.
Change-Id: I1efeaa955b87b57b0da805ae5942d138bbce1544
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.gldebugger.tests')
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java index 305e8ac..984cbee 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java @@ -39,6 +39,7 @@ public class GLMessageFormatterTest { "const GLchar*, glGetString, GLenum name", "void, glMultMatrixf, const GLfloat* m", "GLenum, eglBindAPI, GLEnum arg", + "void, glGetActiveAttrib, GLenum* type", "void, glTexImage2D, GLint level, GLsizei width, const GLvoid* pixels"); private static GLMessageFormatter sGLMessageFormatter; @@ -126,6 +127,19 @@ public class GLMessageFormatterTest { assertEquals(expected, actual); } + @Test + public void testMessageWithEnumPointer() { + //void, glGetActiveAttrib, GLenum* type + GLMessage msg = constructGLMessage(null, + Function.glGetActiveAttrib, + createIntegerPointerDataType(GLEnum.GL_FLOAT_MAT4.value)); + + String expected = "glGetActiveAttrib(type = [GL_FLOAT_MAT4])"; + String actual = sGLMessageFormatter.formatGLMessage(msg); + + assertEquals(expected, actual); + } + private DataType createStringDataType(String retValue) { return DataType.newBuilder() .addCharValue(ByteString.copyFromUtf8(retValue)) |