LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GLES2Dbg: noop - camelCase function names

Browse Source 
Change-Id: Ifff2157fc9acd6d51b652a157a086dd0f81a67ae
Signed-off-by: David Li <davidxli@google.com>
This commit is contained in:
David Li
2011-04-15 09:56:38 -07:00
parent 3a9021e615
commit c26ad8b03b
17 changed files with 812 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/glesv2debugger/generate_MessageFormatter_java.py
View File

@@ -58,7 +58,7 @@ import java.nio.ByteBuffer;
public class MessageFormatter {
static String FormatFloats(int count, final ByteBuffer data) {
static String formatFloats(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -71,7 +71,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatInts(int count, final ByteBuffer data) {
static String formatInts(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -84,7 +84,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatUints(int count, final ByteBuffer data) {
static String formatUInts(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -98,7 +98,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatMatrix(int columns, int count, final ByteBuffer data) {
static String formatMatrix(int columns, int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -113,7 +113,7 @@ public class MessageFormatter {
return ret + "}";
}
public static String Format(final DebuggerMessage.Message msg,
public static String format(final DebuggerMessage.Message msg,
final boolean code) {
String str;
switch (msg.getFunction()) {
@@ -183,11 +183,11 @@ public class MessageFormatter {
count = int(annotation)
dataFormatter = ""
if paramType == "GLfloat":
dataFormatter = "FormatFloats"
dataFormatter = "formatFloats"
elif paramType == "GLint":
dataFormatter = "FormatInts"
dataFormatter = "formatInts"
elif paramType == "GLuint":
dataFormatter = "FormatUints"
dataFormatter = "formatUInts"
elif annotation == "GLstring":
assert paramType == "GLchar"
elif paramType.find("void") >= 0:
@@ -200,7 +200,7 @@ public class MessageFormatter {
assert countArg != ""
assert paramType == "GLfloat"
formatArgs += '\
, (code ? "(GLfloat [])" : "") + FormatMatrix(%d, %d * msg.getArg%d(), msg.getData().asReadOnlyByteBuffer())' % (
, (code ? "(GLfloat [])" : "") + formatMatrix(%d, %d * msg.getArg%d(), msg.getData().asReadOnlyByteBuffer())' % (
columns, count, paramNames.index(countArg))
elif annotation == "GLstring":
formatArgs += '\
@@ -262,7 +262,7 @@ package GLESv2Debugger;
public class MessageFormatterCustom {
public static String Format(final DebuggerMessage.Message msg) {
public static String format(final DebuggerMessage.Message msg) {
String str;
switch (msg.getFunction()) {"""

54
tools/glesv2debugger/generate_MessageParser_java.py
View File

@@ -65,7 +65,7 @@ public abstract class MessageParser {
String args;
String[] GetList()
String[] getList()
{
assert args.charAt(0) == '{';
String arg = args;
@@ -79,41 +79,41 @@ public abstract class MessageParser {
return arg.split(",");
}
ByteString ParseFloats(int count) {
ByteString parseFloats(int count) {
ByteBuffer buffer = ByteBuffer.allocate(count * 4);
buffer.order(SampleView.targetByteOrder);
String [] arg = GetList();
String [] arg = getList();
for (int i = 0; i < count; i++)
buffer.putFloat(Float.parseFloat(arg[i].trim()));
buffer.rewind();
return ByteString.copyFrom(buffer);
}
ByteString ParseInts(int count) {
ByteString parseInts(int count) {
ByteBuffer buffer = ByteBuffer.allocate(count * 4);
buffer.order(SampleView.targetByteOrder);
String [] arg = GetList();
String [] arg = getList();
for (int i = 0; i < count; i++)
buffer.putInt(Integer.parseInt(arg[i].trim()));
buffer.rewind();
return ByteString.copyFrom(buffer);
}
ByteString ParseUInts(int count) {
ByteString parseUInts(int count) {
ByteBuffer buffer = ByteBuffer.allocate(count * 4);
buffer.order(SampleView.targetByteOrder);
String [] arg = GetList();
String [] arg = getList();
for (int i = 0; i < count; i++)
buffer.putInt((int)(Long.parseLong(arg[i].trim()) & 0xffffffff));
buffer.rewind();
return ByteString.copyFrom(buffer);
}
ByteString ParseMatrix(int columns, int count) {
return ParseFloats(columns * count);
ByteString parseMatrix(int columns, int count) {
return parseFloats(columns * count);
}
ByteString ParseString() {
ByteString parseString() {
// TODO: escape sequence and proper string literal
String arg = args.substring(args.indexOf('"') + 1, args.lastIndexOf('"'));
args = args.substring(args.lastIndexOf('"'));
@@ -125,7 +125,7 @@ public abstract class MessageParser {
return ByteString.copyFromUtf8(arg);
}
String GetArgument()
String getArgument()
{
int comma = args.indexOf(",");
String arg = null;
@@ -144,9 +144,9 @@ public abstract class MessageParser {
return arg;
}
int ParseArgument()
int parseArgument()
{
String arg = GetArgument();
String arg = getArgument();
if (arg.startsWith("GL_"))
return GLEnum.valueOf(arg).value;
else if (arg.toLowerCase().startsWith("0x"))
@@ -155,13 +155,13 @@ public abstract class MessageParser {
return Integer.parseInt(arg);
}
int ParseFloat()
int parseFloat()
{
String arg = GetArgument();
String arg = getArgument();
return Float.floatToRawIntBits(Float.parseFloat(arg));
}
public void Parse(final Message.Builder builder, String string) {
public void parse(final Message.Builder builder, String string) {
int lparen = string.indexOf("("), rparen = string.lastIndexOf(")");
String s = string.substring(0, lparen).trim();
args = string.substring(lparen + 1, rparen);
@@ -225,11 +225,11 @@ public abstract class MessageParser {
count = int(annotation)
if paramType == "GLfloat":
argumentParser = "ParseFloats"
argumentParser = "parseFloats"
elif paramType == "GLint":
argumentParser = "ParseInts"
argumentParser = "parseInts"
elif paramType == "GLuint":
argumentParser = "ParseUInts"
argumentParser = "parseUInts"
elif annotation == "GLstring":
assert paramType == 'GLchar'
elif paramType.find("void") >= 0:
@@ -242,10 +242,10 @@ public abstract class MessageParser {
assert columns * columns == count
assert countArg != ""
assert paramType == "GLfloat"
dataSetter = "builder.setData(ParseMatrix(%d, %d * builder.getArg%d()));" % (
dataSetter = "builder.setData(parseMatrix(%d, %d * builder.getArg%d()));" % (
columns, count, paramNames.index(countArg))
elif annotation == "GLstring":
dataSetter = "builder.setData(ParseString());"
dataSetter = "builder.setData(parseString());"
elif paramType.find("void") >= 0:
dataSetter = "// TODO"
abstract = True
@@ -259,7 +259,7 @@ public abstract class MessageParser {
else:
if paramType == "GLfloat" or paramType == "GLclampf":
argumentSetters += "\
builder.setArg%d(ParseFloat()); // %s %s\n" % (
builder.setArg%d(parseFloat()); // %s %s\n" % (
paramIndex, paramType, paramName)
elif paramType.find("*") >= 0:
argumentSetters += "\
@@ -267,7 +267,7 @@ public abstract class MessageParser {
abstract = True
else:
argumentSetters += "\
builder.setArg%d(ParseArgument()); // %s %s\n" % (
builder.setArg%d(parseArgument()); // %s %s\n" % (
paramIndex, paramType, paramName)
paramNames.append(paramName)
paramIndex += 1
@@ -276,14 +276,14 @@ public abstract class MessageParser {
output.write("%s" % argumentSetters)
else:
output.write("\
Parse_%s(builder);\n" % functionName)
parse_%s(builder);\n" % functionName)
abstractParsers += "\
abstract void Parse_%s(Message.Builder builder);\n" % functionName
abstract void parse_%s(Message.Builder builder);\n" % functionName
print """\
@Override
void Parse_%s(Message.Builder builder) {
void parse_%s(Message.Builder builder) {
%s }
""" % (functionName, argumentSetters) # print skeleton code for MessageParserE
""" % (functionName, argumentSetters) # print skeleton code for MessageParserEx
output.write("\
break;\n")

26
tools/glesv2debugger/src/com/android/glesv2debugger/BreakpointOption.java
View File

@@ -74,7 +74,7 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
this.layout();
}
void SetBreakpoint(Function function, boolean enabled) {
void setBreakpoint(Function function, boolean enabled) {
Message.Builder builder = Message.newBuilder();
builder.setContextId(0); // FIXME: proper context id
builder.setType(Type.Response);
@@ -83,14 +83,14 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
builder.setProp(Prop.ExpectResponse);
builder.setArg0(function.getNumber());
builder.setArg1(enabled ? 1 : 0);
sampleView.messageQueue.AddCommand(builder.build());
sampleView.messageQueue.addCommand(builder.build());
}
@Override
public void widgetSelected(SelectionEvent e) {
Button btn = (Button) e.widget;
Group group = (Group) btn.getParent();
SetBreakpoint(Function.valueOf(group.getText()), btn.getSelection());
setBreakpoint(Function.valueOf(group.getText()), btn.getSelection());
}
@Override
@@ -99,12 +99,12 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
private Function lastFunction = Function.NEG;
public boolean ProcessMessage(final MessageQueue queue, final Message msg) throws IOException {
public boolean processMessage(final MessageQueue queue, final Message msg) throws IOException {
// use DefaultProcessMessage just to register the GL call
// but do not send response
final int contextId = msg.getContextId();
if (msg.getType() == Type.BeforeCall || msg.getType() == Type.AfterCall)
queue.DefaultProcessMessage(msg, true, false);
queue.defaultProcessMessage(msg, true, false);
final Message.Builder builder = Message.newBuilder();
builder.setContextId(contextId);
builder.setType(Type.Response);
@@ -114,7 +114,7 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
shell.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
String call = MessageFormatter.Format(msg, false);
String call = MessageFormatter.format(msg, false);
call = call.substring(0, call.indexOf("(")) + ' ' +
msg.getFunction() + call.substring(call.indexOf("("));
if (msg.hasData() && msg.getFunction() == Function.glShaderSource)
@@ -151,8 +151,8 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
{
builder.setFunction(Function.SKIP);
// AfterCall is skipped, so push BeforeCall to complete
if (queue.GetPartialMessage(contextId) != null)
queue.CompletePartialMessage(contextId);
if (queue.getPartialMessage(contextId) != null)
queue.completePartialMessage(contextId);
}
else if (s.startsWith("c"))
builder.setFunction(Function.CONTINUE);
@@ -160,23 +160,23 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
{
Button btn = buttonsBreak.get(msg.getFunction());
btn.setSelection(false);
SetBreakpoint(msg.getFunction(), false);
setBreakpoint(msg.getFunction(), false);
builder.setExpectResponse(false);
}
else
{
MessageParserEx.instance.Parse(builder, inputDialog.getValue());
MessageParserEx.instance.parse(builder, inputDialog.getValue());
lastFunction = builder.getFunction();
builder.setExpectResponse(true);
// AfterCall is skipped, so push BeforeCall to complete
if (queue.GetPartialMessage(contextId) != null)
queue.CompletePartialMessage(contextId);
if (queue.getPartialMessage(contextId) != null)
queue.completePartialMessage(contextId);
}
}
// else defaults to continue BeforeCall and skip AfterCall
}
});
queue.SendMessage(builder.build());
queue.sendMessage(builder.build());
return true;
}
}

130
tools/glesv2debugger/src/com/android/glesv2debugger/CodeGen.java
View File

@@ -40,25 +40,25 @@ public class CodeGen implements IRunnableWithProgress {
framebufferNames, programNames, textureNames, shaderNames, renderbufferNames;
/** return true if msg was a texture upload */
private boolean CodeGenTextureUpload(final Message msg, final boolean replaceCopy) {
private boolean codeGenTextureUpload(final Message msg, final boolean replaceCopy) {
String s = null;
switch (msg.getFunction()) {
case glCompressedTexImage2D:
s = MessageFormatter.Format(msg, true).replace("arg7", "texData");
s = MessageFormatter.format(msg, true).replace("arg7", "texData");
break;
case glCompressedTexSubImage2D:
case glTexImage2D:
case glTexSubImage2D:
s = MessageFormatter.Format(msg, true).replace("arg8", "texData");
s = MessageFormatter.format(msg, true).replace("arg8", "texData");
break;
case glCopyTexImage2D:
if (!replaceCopy) {
code.write(MessageFormatter.Format(msg, true));
code.write(MessageFormatter.format(msg, true));
code.write(";CHKERR;\n");
return true;
}
assert msg.getArg2() == msg.getPixelFormat(); // TODO
s = "//" + MessageFormatter.Format(msg, true) + "\n";
s = "//" + MessageFormatter.format(msg, true) + "\n";
s += String.format("glTexImage2D(%s, %d, %s, %d, %d, %d, %s, %s, texData);CHKERR;",
GLEnum.valueOf(msg.getArg0()), msg.getArg1(),
GLEnum.valueOf(msg.getArg2()), msg.getArg5(), msg.getArg6(),
@@ -67,12 +67,12 @@ public class CodeGen implements IRunnableWithProgress {
break;
case glCopyTexSubImage2D:
if (!replaceCopy) {
code.write(MessageFormatter.Format(msg, true));
code.write(MessageFormatter.format(msg, true));
code.write(";CHKERR;\n");
return true;
}
// FIXME: check the texture format & type, and convert
s = "//" + MessageFormatter.Format(msg, true) + "\n";
s = "//" + MessageFormatter.format(msg, true) + "\n";
s += String.format(
"glTexSubImage2D(%s, %d, %d, %d, %d, %d, %s, %s, texData);CHKERR;",
GLEnum.valueOf(msg.getArg0()), msg.getArg1(), msg.getArg2(),
@@ -84,7 +84,7 @@ public class CodeGen implements IRunnableWithProgress {
}
if (msg.hasData()) {
final byte[] data = MessageProcessor.LZFDecompressChunks(msg.getData());
final byte[] data = MessageProcessor.lzfDecompressChunks(msg.getData());
try {
code.write("{\n");
code.format(" void * texData = malloc(%d);CHKERR;\n", data.length);
@@ -107,7 +107,7 @@ public class CodeGen implements IRunnableWithProgress {
return true;
}
private void CodeGenServerState(final GLServerState serverState) {
private void codeGenServerState(final GLServerState serverState) {
code.write("// CodeGenServerState\n");
for (int i = 0; i < serverState.enableDisables.size(); i++) {
final GLEnum key = GLEnum.valueOf(serverState.enableDisables.keyAt(i));
@@ -123,14 +123,14 @@ public class CodeGen implements IRunnableWithProgress {
code.format("// %s is default\n", key);
continue;
}
final String s = MessageFormatter.Format(msg, true);
final String s = MessageFormatter.format(msg, true);
code.write(s);
code.write(";\n");
}
// TODO: stencil and integers
}
private void CodeGenServerShader(final GLServerShader serverShader) {
private void codeGenServerShader(final GLServerShader serverShader) {
code.write("// CodeGenServerShader\n");
for (int i = 0; i < serverShader.shaders.size(); i++) {
final int name = serverShader.shaders.keyAt(i);
@@ -172,7 +172,7 @@ public class CodeGen implements IRunnableWithProgress {
}
}
private void CodeGenServerTexture(final GLServerTexture serverTexture, final boolean replaceCopy) {
private void codeGenServerTexture(final GLServerTexture serverTexture, final boolean replaceCopy) {
code.write("// CodeGenServerTexture\n");
for (int i = 0; i < serverTexture.textures.size(); i++) {
final int name = serverTexture.textures.keyAt(i);
@@ -192,11 +192,11 @@ public class CodeGen implements IRunnableWithProgress {
tex.name);
code.write(s);
for (final Message msg : tex.contentChanges) {
if (CodeGenTextureUpload(msg, replaceCopy))
if (codeGenTextureUpload(msg, replaceCopy))
continue;
switch (msg.getFunction()) {
case glGenerateMipmap:
s = MessageFormatter.Format(msg, true);
s = MessageFormatter.format(msg, true);
break;
default:
assert false;
@@ -237,7 +237,7 @@ public class CodeGen implements IRunnableWithProgress {
serverTexture.texCube.name);
}
private void CodeGenBufferData(final ByteBuffer buffer, final String call) {
private void codeGenBufferData(final ByteBuffer buffer, final String call) {
ByteBuffer bfr = buffer;
if (buffer.isReadOnly()) {
bfr = ByteBuffer.allocate(buffer.capacity());
@@ -263,7 +263,7 @@ public class CodeGen implements IRunnableWithProgress {
}
}
private void CodeGenServerVertex(final GLServerVertex v) {
private void codeGenServerVertex(final GLServerVertex v) {
code.write("// CodeGenServerVertex\n");
for (int i = 0; i < v.buffers.size(); i++) {
final int name = v.buffers.keyAt(i);
@@ -283,7 +283,7 @@ public class CodeGen implements IRunnableWithProgress {
if (buffer.data != null) {
String s = String.format("glBufferData(%s, %d, bufferData, %s)", buffer.target,
buffer.data.capacity(), buffer.usage);
CodeGenBufferData(buffer.data, s);
codeGenBufferData(buffer.data, s);
}
}
}
@@ -314,7 +314,7 @@ public class CodeGen implements IRunnableWithProgress {
code.write("glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);CHKERR;\n");
}
private void CodeGenGenNames(final Message msg) {
private void codeGenGenNames(final Message msg) {
final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
names.order(SampleView.targetByteOrder);
SparseIntArray namesArray = null;
@@ -352,7 +352,7 @@ public class CodeGen implements IRunnableWithProgress {
}
}
private void CodeGenDeleteNames(final Message msg) {
private void codeGenDeleteNames(final Message msg) {
final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
names.order(SampleView.targetByteOrder);
SparseIntArray namesArray = null;
@@ -386,7 +386,7 @@ public class CodeGen implements IRunnableWithProgress {
}
}
private void CodeGenBindNames(final Message msg) {
private void codeGenBindNames(final Message msg) {
String id = null;
SparseIntArray namesArray = null;
final int name = msg.getArg1();
@@ -417,11 +417,11 @@ public class CodeGen implements IRunnableWithProgress {
} else if (namesArray.get(name) != name)
code.format("%s = %d;\n", id, name); // name was deleted
namesArray.put(name, name);
code.write(MessageFormatter.Format(msg, true));
code.write(MessageFormatter.format(msg, true));
code.write(";CHKERR;\n");
}
private void CodeGenDrawArrays(final GLServerVertex v, final MessageData msgData)
private void codeGenDrawArrays(final GLServerVertex v, final MessageData msgData)
throws IOException {
final int maxAttrib = msgData.msg.getArg7();
if (maxAttrib < 1) {
@@ -478,7 +478,7 @@ public class CodeGen implements IRunnableWithProgress {
code.write("};\n");
}
private void CodeGenDrawElements(final GLServerVertex v, final MessageData msgData)
private void codeGenDrawElements(final GLServerVertex v, final MessageData msgData)
throws IOException {
final int maxAttrib = msgData.msg.getArg7();
if (maxAttrib < 1) {
@@ -506,7 +506,7 @@ public class CodeGen implements IRunnableWithProgress {
final byte[] element = new byte[attribDataStride];
final ByteBuffer data = msgData.msg.getData().asReadOnlyByteBuffer();
data.order(SampleView.targetByteOrder);
final ByteBuffer indexData = ByteBuffer.allocate(count * GLServerVertex.TypeSize(type));
final ByteBuffer indexData = ByteBuffer.allocate(count * GLServerVertex.typeSize(type));
indexData.order(SampleView.targetByteOrder);
final ByteBuffer attribData = ByteBuffer.allocate(count * attribDataStride);
attribData.order(SampleView.targetByteOrder);
@@ -596,7 +596,7 @@ public class CodeGen implements IRunnableWithProgress {
code.write("};\n");
}
private void CodeGenDraw(final GLServerVertex v, final MessageData msgData)
private void codeGenDraw(final GLServerVertex v, final MessageData msgData)
throws IOException {
final int maxAttrib = msgData.msg.getArg7();
if (maxAttrib < 1) {
@@ -638,10 +638,10 @@ public class CodeGen implements IRunnableWithProgress {
code.write("};\n");
}
private void CodeGenFunction(final Context ctx, final MessageData msgData)
private void codeGenFunction(final Context ctx, final MessageData msgData)
throws IOException {
final Message msg = msgData.msg;
String call = MessageFormatter.Format(msg, true);
String call = MessageFormatter.format(msg, true);
switch (msg.getFunction()) {
case glActiveTexture:
case glAttachShader:
@@ -651,7 +651,7 @@ public class CodeGen implements IRunnableWithProgress {
case glBindFramebuffer:
case glBindRenderbuffer:
case glBindTexture:
CodeGenBindNames(msg);
codeGenBindNames(msg);
return;
case glBlendColor:
case glBlendEquation:
@@ -660,12 +660,12 @@ public class CodeGen implements IRunnableWithProgress {
case glBlendFuncSeparate:
break;
case glBufferData:
call = MessageFormatter.Format(msg, true).replace("arg2", "bufferData");
CodeGenBufferData(msg.getData().asReadOnlyByteBuffer(), call);
call = MessageFormatter.format(msg, true).replace("arg2", "bufferData");
codeGenBufferData(msg.getData().asReadOnlyByteBuffer(), call);
return;
case glBufferSubData:
call = MessageFormatter.Format(msg, true).replace("arg3", "bufferData");
CodeGenBufferData(msg.getData().asReadOnlyByteBuffer(), call);
call = MessageFormatter.format(msg, true).replace("arg3", "bufferData");
codeGenBufferData(msg.getData().asReadOnlyByteBuffer(), call);
return;
case glCheckFramebufferStatus:
case glClear:
@@ -679,7 +679,7 @@ public class CodeGen implements IRunnableWithProgress {
case glCompressedTexSubImage2D:
case glCopyTexImage2D:
case glCopyTexSubImage2D:
CodeGenTextureUpload(msg, false);
codeGenTextureUpload(msg, false);
return;
case glCreateProgram:
namesHeader.format("extern GLuint program_%d;\n", msg.getRet());
@@ -699,13 +699,13 @@ public class CodeGen implements IRunnableWithProgress {
programNames.put(msg.getArg0(), 0);
break;
case glDeleteRenderbuffers:
CodeGenDeleteNames(msg);
codeGenDeleteNames(msg);
return;
case glDeleteShader:
shaderNames.put(msg.getArg0(), 0);
return;
case glDeleteTextures:
CodeGenDeleteNames(msg);
codeGenDeleteNames(msg);
return;
case glDepthFunc:
case glDepthMask:
@@ -716,11 +716,11 @@ public class CodeGen implements IRunnableWithProgress {
break;
case glDrawArrays:
// CodeGenDraw(ctx.serverVertex, msgData);
CodeGenDrawArrays(ctx.serverVertex, msgData);
codeGenDrawArrays(ctx.serverVertex, msgData);
return;
case glDrawElements:
// CodeGenDraw(ctx.serverVertex, msgData);
CodeGenDrawElements(ctx.serverVertex, msgData);
codeGenDrawElements(ctx.serverVertex, msgData);
return;
case glEnable:
case glEnableVertexAttribArray:
@@ -731,14 +731,14 @@ public class CodeGen implements IRunnableWithProgress {
case glFrontFace:
break;
case glGenBuffers:
CodeGenGenNames(msg);
codeGenGenNames(msg);
return;
case glGenerateMipmap:
break;
case glGenFramebuffers:
case glGenRenderbuffers:
case glGenTextures:
CodeGenGenNames(msg);
codeGenGenNames(msg);
return;
case glGetActiveAttrib:
case glGetActiveUniform:
@@ -814,7 +814,7 @@ public class CodeGen implements IRunnableWithProgress {
case glStencilOpSeparate:
break;
case glTexImage2D:
CodeGenTextureUpload(msg, false);
codeGenTextureUpload(msg, false);
return;
case glTexParameterf:
break;
@@ -825,7 +825,7 @@ public class CodeGen implements IRunnableWithProgress {
case glTexParameteriv:
return; // TODO
case glTexSubImage2D:
CodeGenTextureUpload(msg, false);
codeGenTextureUpload(msg, false);
return;
case glUniform1f:
case glUniform1fv:
@@ -880,7 +880,7 @@ public class CodeGen implements IRunnableWithProgress {
code.write(call + ";CHKERR;\n");
}
private void CodeGenSetup(final Context ctx) {
private void codeGenSetup(final Context ctx) {
try {
codeFile = new FileWriter("frame_setup.cpp", false);
code = new PrintWriter(codeFile);
@@ -1060,10 +1060,10 @@ public class CodeGen implements IRunnableWithProgress {
code.write("#include \"frame_names.h\"\n");
code.write("void FrameSetup(){\n");
CodeGenServerState(ctx.serverState);
CodeGenServerShader(ctx.serverShader);
CodeGenServerTexture(ctx.serverTexture, true);
CodeGenServerVertex(ctx.serverVertex);
codeGenServerState(ctx.serverState);
codeGenServerShader(ctx.serverShader);
codeGenServerTexture(ctx.serverTexture, true);
codeGenServerVertex(ctx.serverVertex);
code.write("}\n");
@@ -1080,7 +1080,7 @@ public class CodeGen implements IRunnableWithProgress {
}
}
private void CodeGenCleanup() {
private void codeGenCleanup() {
make.write(" frame_setup.cpp \\\n");
make.write(" frame_names.cpp \\\n");
make.write("#\n");
@@ -1134,8 +1134,8 @@ public class CodeGen implements IRunnableWithProgress {
public void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
progress.beginTask("CodeGenFrames", count + 2);
Context ctx = dbgCtx.GetFrame(0).startContext.clone();
CodeGenSetup(ctx);
Context ctx = dbgCtx.getFrame(0).startContext.clone();
codeGenSetup(ctx);
progress.worked(1);
for (int i = 0; i < count; i++) {
try {
@@ -1149,14 +1149,14 @@ public class CodeGen implements IRunnableWithProgress {
code.write("#include \"frame_names.h\"\n");
code.format("void Frame%d(){\n", i);
final Frame frame = dbgCtx.GetFrame(i);
for (int j = 0; j < frame.Size(); j++) {
final MessageData msgData = frame.Get(j);
final Frame frame = dbgCtx.getFrame(i);
for (int j = 0; j < frame.size(); j++) {
final MessageData msgData = frame.get(j);
code.format("/* frame function %d: %s %s*/\n", j, msgData.msg.getFunction(),
MessageFormatter.Format(msgData.msg, false));
ctx.ProcessMessage(msgData.msg);
MessageFormatter.format(msgData.msg, false));
ctx.processMessage(msgData.msg);
try {
CodeGenFunction(ctx, msgData);
codeGenFunction(ctx, msgData);
} catch (IOException e) {
e.printStackTrace();
assert false;
@@ -1180,11 +1180,11 @@ public class CodeGen implements IRunnableWithProgress {
}
namesSource.write("};\n");
namesSource.format("const unsigned int FrameCount = %d;\n", count);
CodeGenCleanup();
codeGenCleanup();
progress.worked(1);
}
void CodeGenFrames(final DebugContext dbgCtx, int count, final Shell shell) {
void codeGenFrames(final DebugContext dbgCtx, int count, final Shell shell) {
this.dbgCtx = dbgCtx;
this.count = count;
ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);
@@ -1202,9 +1202,9 @@ public class CodeGen implements IRunnableWithProgress {
progress = null;
}
void CodeGenFrame(final Frame frame) {
void codeGenFrame(final Frame frame) {
Context ctx = frame.startContext.clone();
CodeGenSetup(ctx);
codeGenSetup(ctx);
try {
codeFile = new FileWriter("frame0.cpp", false);
code = new PrintWriter(codeFile);
@@ -1215,13 +1215,13 @@ public class CodeGen implements IRunnableWithProgress {
make.format(" frame0.cpp \\\n");
code.write("#include \"frame_names.h\"\n");
code.format("void Frame0(){\n");
for (int i = 0; i < frame.Size(); i++) {
final MessageData msgData = frame.Get(i);
for (int i = 0; i < frame.size(); i++) {
final MessageData msgData = frame.get(i);
code.format("/* frame function %d: %s %s*/\n", i, msgData.msg.getFunction(),
MessageFormatter.Format(msgData.msg, false));
ctx.ProcessMessage(msgData.msg);
MessageFormatter.format(msgData.msg, false));
ctx.processMessage(msgData.msg);
try {
CodeGenFunction(ctx, msgData);
codeGenFunction(ctx, msgData);
} catch (IOException e) {
e.printStackTrace();
assert false;
@@ -1232,6 +1232,6 @@ public class CodeGen implements IRunnableWithProgress {
namesHeader.write("extern void (* Frames[1])();\n");
namesSource.write("void (* Frames[1])() = {Frame0};\n");
namesSource.write("const unsigned int FrameCount = 1;\n");
CodeGenCleanup();
codeGenCleanup();
}
}

66
tools/glesv2debugger/src/com/android/glesv2debugger/Context.java
View File

@@ -56,45 +56,45 @@ class Frame {
this.filePosition = filePosition;
}
void Add(final MessageData msgData) {
void add(final MessageData msgData) {
calls.add(msgData);
}
void IncreaseCallsCount() {
void increaseCallsCount() {
callsCount++;
}
Context ComputeContext(final MessageData call) {
Context computeContext(final MessageData call) {
Context ctx = startContext.clone();
for (int i = 0; i < calls.size(); i++)
if (call == calls.get(i))
return ctx;
else
ctx.ProcessMessage(calls.get(i).msg);
ctx.processMessage(calls.get(i).msg);
assert false;
return ctx;
}
int Size() {
int size() {
return callsCount;
}
MessageData Get(final int i) {
MessageData get(final int i) {
return calls.get(i);
}
ArrayList<MessageData> Get() {
ArrayList<MessageData> get() {
return calls;
}
void Unload() {
void unload() {
if (calls == null)
return;
calls.clear();
calls = null;
}
void Load(final RandomAccessFile file) {
void load(final RandomAccessFile file) {
if (calls != null && calls.size() == callsCount)
return;
try {
@@ -109,7 +109,7 @@ class Frame {
final byte[] data = new byte[len];
file.read(data);
Message msg = Message.parseFrom(data);
ctx.ProcessMessage(msg);
ctx.processMessage(msg);
final MessageData msgData = new MessageData(Display.getCurrent(), msg, ctx);
calls.add(msgData);
}
@@ -153,20 +153,20 @@ class DebugContext {
* Caches new Message, and formats into MessageData for current frame; this
* function is called exactly once for each new Message
*/
void ProcessMessage(final Message newMsg) {
void processMessage(final Message newMsg) {
Message msg = newMsg;
currentContext.ProcessMessage(newMsg);
currentContext.processMessage(newMsg);
if (msg.hasDataType() && msg.getDataType() == DataType.ReferencedImage) {
final byte[] referenced = MessageProcessor.LZFDecompressChunks(msg.getData());
currentContext.readPixelRef = MessageProcessor.DecodeReferencedImage(
final byte[] referenced = MessageProcessor.lzfDecompressChunks(msg.getData());
currentContext.readPixelRef = MessageProcessor.decodeReferencedImage(
currentContext.readPixelRef, referenced);
final byte[] decoded = MessageProcessor.LZFCompressChunks(
final byte[] decoded = MessageProcessor.lzfCompressChunks(
currentContext.readPixelRef, referenced.length);
msg = newMsg.toBuilder().setDataType(DataType.NonreferencedImage)
.setData(ByteString.copyFrom(decoded)).build();
}
synchronized (file) {
lastFrame.IncreaseCallsCount();
lastFrame.increaseCallsCount();
final byte[] data = msg.toByteArray();
final ByteBuffer len = ByteBuffer.allocate(4);
len.order(SampleView.targetByteOrder);
@@ -184,14 +184,14 @@ class DebugContext {
}
if (loadedFrame == lastFrame) {
final MessageData msgData = new MessageData(Display.getCurrent(), msg, currentContext);
lastFrame.Add(msgData);
lastFrame.add(msgData);
uiUpdate = true;
}
if (msg.getFunction() != Function.eglSwapBuffers)
return;
synchronized (frames) {
if (loadedFrame != lastFrame)
lastFrame.Unload();
lastFrame.unload();
try {
frames.add(lastFrame = new Frame(currentContext, file.getFilePointer()));
// file.getChannel().force(false);
@@ -204,22 +204,22 @@ class DebugContext {
return;
}
Frame GetFrame(int index) {
Frame getFrame(int index) {
synchronized (frames) {
Frame newFrame = frames.get(index);
if (loadedFrame != null && loadedFrame != lastFrame && newFrame != loadedFrame) {
loadedFrame.Unload();
loadedFrame.unload();
uiUpdate = true;
}
loadedFrame = newFrame;
synchronized (file) {
loadedFrame.Load(file);
loadedFrame.load(file);
}
return loadedFrame;
}
}
int FrameCount() {
int frameCount() {
synchronized (frames) {
return frames.size();
}
@@ -264,14 +264,14 @@ public class Context implements Cloneable {
}
/** mainly updating states */
public void ProcessMessage(Message msg) {
if (serverVertex.Process(msg))
public void processMessage(Message msg) {
if (serverVertex.process(msg))
return;
if (serverShader.ProcessMessage(msg))
if (serverShader.processMessage(msg))
return;
if (serverState.ProcessMessage(msg))
if (serverState.processMessage(msg))
return;
if (serverTexture.ProcessMessage(msg))
if (serverTexture.processMessage(msg))
return;
}
}
@@ -299,7 +299,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
if (entry.obj != null) {
objStr = entry.obj.toString();
if (entry.obj instanceof Message)
objStr = MessageFormatter.Format((Message) entry.obj, false);
objStr = MessageFormatter.format((Message) entry.obj, false);
}
return entry.name + " = " + objStr;
}
@@ -320,7 +320,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
case glCopyTexImage2D:
case glCopyTexSubImage2D:
return entry.image = new MessageData(Display.getCurrent(), msg, null)
.GetImage();
.getImage();
default:
return null;
}
@@ -384,7 +384,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
final Message val = context.serverState.integers.valueAt(i);
if (val != null)
children.add(GLEnum.valueOf(key).name() + " : " +
MessageFormatter.Format(val, false));
MessageFormatter.format(val, false));
else
children.add(GLEnum.valueOf(key).name() + " : default");
}
@@ -396,7 +396,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
children.add(Function.valueOf(key).name() + " : default");
else
children.add(Function.valueOf(key).name() + " : "
+ MessageFormatter.Format(msg, false));
+ MessageFormatter.format(msg, false));
}
} else if (entry.obj instanceof SparseArray) {
SparseArray<?> sa = (SparseArray<?>) entry.obj;
@@ -460,7 +460,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
return Array.getLength(obj) > 0;
else if (obj instanceof Message)
return false;
else if (IsPrimitive(obj))
else if (isPrimitive(obj))
return false;
else if (obj.getClass().equals(String.class))
return false;
@@ -471,7 +471,7 @@ class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
return obj.getClass().getFields().length > 0;
}
static boolean IsPrimitive(final Object obj) {
static boolean isPrimitive(final Object obj) {
final Class<? extends Object> c = obj.getClass();
if (c.isPrimitive())
return true;

24
tools/glesv2debugger/src/com/android/glesv2debugger/GLServerShader.java
View File

@@ -111,7 +111,7 @@ public class GLServerShader implements Cloneable {
}
/** returns true if processed */
public boolean ProcessMessage(final Message msg) {
public boolean processMessage(final Message msg) {
boolean oldUiUpdate = uiUpdate;
uiUpdate = true;
switch (msg.getFunction()) {
@@ -145,7 +145,7 @@ public class GLServerShader implements Cloneable {
}
}
GLShader GetShader(int name) {
GLShader getShader(int name) {
if (name == 0)
return null;
for (Context ctx : context.shares) {
@@ -157,7 +157,7 @@ public class GLServerShader implements Cloneable {
return null;
}
GLProgram GetProgram(int name) {
GLProgram getProgram(int name) {
if (name == 0)
return null;
for (Context ctx : context.shares) {
@@ -171,9 +171,9 @@ public class GLServerShader implements Cloneable {
// void API_ENTRY(glAttachShader)(GLuint program, GLuint shader)
void glAttachShader(final Message msg) {
GLProgram program = GetProgram(msg.getArg0());
GLProgram program = getProgram(msg.getArg0());
assert program != null;
GLShader shader = GetShader(msg.getArg1());
GLShader shader = getShader(msg.getArg1());
assert program != null;
if (GLEnum.GL_VERTEX_SHADER == shader.type)
program.vert = shader.name;
@@ -197,13 +197,13 @@ public class GLServerShader implements Cloneable {
void glDeleteProgram(final Message msg) {
if (msg.getArg0() == 0)
return;
GLProgram program = GetProgram(msg.getArg0());
GLProgram program = getProgram(msg.getArg0());
program.delete = true;
for (Context ctx : context.shares)
if (ctx.serverShader.current == program)
return;
glDetachShader(program, GetShader(program.vert));
glDetachShader(program, GetShader(program.frag));
glDetachShader(program, getShader(program.vert));
glDetachShader(program, getShader(program.frag));
programs.remove(program.name);
}
@@ -211,7 +211,7 @@ public class GLServerShader implements Cloneable {
void glDeleteShader(final Message msg) {
if (msg.getArg0() == 0)
return;
GLShader shader = GetShader(msg.getArg0());
GLShader shader = getShader(msg.getArg0());
shader.delete = true;
if (shader.programs.size() == 0)
shaders.remove(shader.name);
@@ -219,7 +219,7 @@ public class GLServerShader implements Cloneable {
// void API_ENTRY(glDetachShader)(GLuint program, GLuint shader)
void glDetachShader(final Message msg) {
glDetachShader(GetProgram(msg.getArg0()), GetShader(msg.getArg1()));
glDetachShader(getProgram(msg.getArg0()), getShader(msg.getArg1()));
}
void glDetachShader(final GLProgram program, final GLShader shader) {
@@ -241,14 +241,14 @@ public class GLServerShader implements Cloneable {
void glShaderSource(final Message msg) {
if (!msg.hasData())
return; // TODO: distinguish between generated calls
GLShader shader = GetShader(msg.getArg0());
GLShader shader = getShader(msg.getArg0());
shader.source = shader.originalSource = msg.getData().toStringUtf8();
}
// void API_ENTRY(glUseProgram)(GLuint program)
void glUseProgram(final Message msg) {
GLProgram oldCurrent = current;
current = GetProgram(msg.getArg0());
current = getProgram(msg.getArg0());
if (null != oldCurrent && oldCurrent.delete && oldCurrent != current) {
for (Context ctx : context.shares)
if (ctx.serverShader.current == oldCurrent)

22
tools/glesv2debugger/src/com/android/glesv2debugger/GLServerState.java
View File

@@ -90,7 +90,7 @@ public class GLServerState implements Cloneable {
}
/** returns true if processed */
public boolean ProcessMessage(final Message msg) {
public boolean processMessage(final Message msg) {
switch (msg.getFunction()) {
case glBlendColor:
case glBlendEquation:
@@ -105,14 +105,14 @@ public class GLServerState implements Cloneable {
case glDepthMask:
case glDepthFunc:
case glDepthRangef:
return Setter(msg);
return setter(msg);
case glDisable:
return EnableDisable(false, msg);
return enableDisable(false, msg);
case glEnable:
return EnableDisable(true, msg);
return enableDisable(true, msg);
case glFrontFace:
case glLineWidth:
return Setter(msg);
return setter(msg);
case glPixelStorei:
if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_PACK_ALIGNMENT)
integers.put(msg.getArg0(), msg);
@@ -124,7 +124,7 @@ public class GLServerState implements Cloneable {
case glPolygonOffset:
case glSampleCoverage:
case glScissor:
return Setter(msg);
return setter(msg);
case glStencilFunc: {
Message.Builder builder = msg.toBuilder();
builder.setArg2(msg.getArg1());
@@ -136,7 +136,7 @@ public class GLServerState implements Cloneable {
return glStencilFuncSeparate(msg);
case glStencilMask:
case glStencilMaskSeparate:
return Setter(msg);
return setter(msg);
case glStencilOp: {
Message.Builder builder = msg.toBuilder();
builder.setArg3(msg.getArg2());
@@ -148,13 +148,13 @@ public class GLServerState implements Cloneable {
case glStencilOpSeparate:
return glStencilOpSeparate(msg);
case glViewport:
return Setter(msg);
return setter(msg);
default:
return false;
}
}
boolean Setter(final Message msg) {
boolean setter(final Message msg) {
switch (msg.getFunction()) {
case glBlendFunc:
lastSetter.put(Function.glBlendFuncSeparate.getNumber(), msg);
@@ -172,11 +172,11 @@ public class GLServerState implements Cloneable {
return true;
}
boolean EnableDisable(boolean enable, final Message msg) {
boolean enableDisable(boolean enable, final Message msg) {
int index = enableDisables.indexOfKey(msg.getArg0());
if (index < 0) {
System.out.print("invalid glDisable/Enable: ");
System.out.println(MessageFormatter.Format(msg, false));
System.out.println(MessageFormatter.format(msg, false));
return true;
}
if ((enableDisables.valueAt(index) != 0) == enable)

26
tools/glesv2debugger/src/com/android/glesv2debugger/GLServerTexture.java
View File

@@ -50,7 +50,7 @@ class GLTexture implements Cloneable {
}
}
boolean ProcessMessage(final Message msg) {
boolean processMessage(final Message msg) {
switch (msg.getFunction()) {
case glCompressedTexImage2D:
case glCopyTexImage2D:
@@ -121,13 +121,13 @@ public class GLServerTexture implements Cloneable {
}
}
public boolean ProcessMessage(final Message msg) {
public boolean processMessage(final Message msg) {
switch (msg.getFunction()) {
case glActiveTexture:
activeTexture = GLEnum.valueOf(msg.getArg0());
return true;
case glBindTexture:
return BindTexture(msg.getArg0(), msg.getArg1());
return bindTexture(msg.getArg0(), msg.getArg1());
case glCompressedTexImage2D:
case glCompressedTexSubImage2D:
case glCopyTexImage2D:
@@ -137,7 +137,7 @@ public class GLServerTexture implements Cloneable {
switch (GLEnum.valueOf(msg.getArg0())) {
case GL_TEXTURE_2D:
if (tex2D != null)
return tex2D.ProcessMessage(msg);
return tex2D.processMessage(msg);
return true;
case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
@@ -146,7 +146,7 @@ public class GLServerTexture implements Cloneable {
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
if (texCube != null)
return texCube.ProcessMessage(msg);
return texCube.processMessage(msg);
return true;
default:
return true;
@@ -157,9 +157,9 @@ public class GLServerTexture implements Cloneable {
for (int i = 0; i < msg.getArg0(); i++) {
final int name = names.getInt();
if (tex2D != null && tex2D.name == name)
BindTexture(GLEnum.GL_TEXTURE_2D.value, 0);
bindTexture(GLEnum.GL_TEXTURE_2D.value, 0);
if (texCube != null && texCube.name == name)
BindTexture(GLEnum.GL_TEXTURE_CUBE_MAP.value, 0);
bindTexture(GLEnum.GL_TEXTURE_CUBE_MAP.value, 0);
if (name != 0)
textures.remove(name);
}
@@ -167,22 +167,22 @@ public class GLServerTexture implements Cloneable {
}
case glGenerateMipmap:
if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_TEXTURE_2D && tex2D != null)
return tex2D.ProcessMessage(msg);
return tex2D.processMessage(msg);
else if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_TEXTURE_CUBE_MAP
&& texCube != null)
return texCube.ProcessMessage(msg);
return texCube.processMessage(msg);
return true;
case glTexParameteri:
return TexParameter(msg.getArg0(), msg.getArg1(), msg.getArg2());
return texParameter(msg.getArg0(), msg.getArg1(), msg.getArg2());
case glTexParameterf:
return TexParameter(msg.getArg0(), msg.getArg1(),
return texParameter(msg.getArg0(), msg.getArg1(),
(int) Float.intBitsToFloat(msg.getArg2()));
default:
return false;
}
}
boolean BindTexture(final int target, final int name) {
boolean bindTexture(final int target, final int name) {
final int index = activeTexture.value - GLEnum.GL_TEXTURE0.value;
if (GLEnum.valueOf(target) == GLEnum.GL_TEXTURE_2D) {
tex2D = textures.get(name);
@@ -203,7 +203,7 @@ public class GLServerTexture implements Cloneable {
return true;
}
boolean TexParameter(final int target, final int pname, final int param) {
boolean texParameter(final int target, final int pname, final int param) {
GLTexture tex = null;
if (GLEnum.valueOf(target) == GLEnum.GL_TEXTURE_2D)
tex = tex2D;

20
tools/glesv2debugger/src/com/android/glesv2debugger/GLServerVertex.java
View File

@@ -137,7 +137,7 @@ public class GLServerVertex implements Cloneable {
}
/** returns true if processed */
public boolean Process(final Message msg) {
public boolean process(final Message msg) {
switch (msg.getFunction()) {
case glBindBuffer:
glBindBuffer(msg);
@@ -276,7 +276,7 @@ public class GLServerVertex implements Cloneable {
attribPointers[msg.getArg0()].enabled = false;
}
float FetchConvert(final ByteBuffer src, final GLEnum type, final boolean normalized) {
float fetchConvert(final ByteBuffer src, final GLEnum type, final boolean normalized) {
if (GLEnum.GL_FLOAT == type)
return Float.intBitsToFloat(src.getInt());
else if (GLEnum.GL_UNSIGNED_INT == type)
@@ -319,7 +319,7 @@ public class GLServerVertex implements Cloneable {
return 0;
}
static int TypeSize(final GLEnum type) {
static int typeSize(final GLEnum type) {
switch (type) {
case GL_FLOAT:
case GL_UNSIGNED_INT:
@@ -338,7 +338,7 @@ public class GLServerVertex implements Cloneable {
}
}
void Fetch(final int maxAttrib, final int index, final int dstIdx, final ByteBuffer nonVBO,
void fetch(final int maxAttrib, final int index, final int dstIdx, final ByteBuffer nonVBO,
final float[][] fetchedAttribs) {
for (int i = 0; i < maxAttrib; i++) {
final GLAttribPointer attrib = attribPointers[i];
@@ -349,11 +349,11 @@ public class GLServerVertex implements Cloneable {
final ByteBuffer src = attrib.buffer.data;
src.position(attrib.ptr + index * attrib.elemStride);
for (int j = 0; j < size; j++)
fetchedAttribs[i][dstIdx * 4 + j] = FetchConvert(src, attrib.type,
fetchedAttribs[i][dstIdx * 4 + j] = fetchConvert(src, attrib.type,
attrib.normalized);
} else
for (int j = 0; j < size; j++)
fetchedAttribs[i][dstIdx * 4 + j] = FetchConvert(nonVBO, attrib.type,
fetchedAttribs[i][dstIdx * 4 + j] = fetchConvert(nonVBO, attrib.type,
attrib.normalized);
}
if (size < 1)
@@ -385,7 +385,7 @@ public class GLServerVertex implements Cloneable {
arrays.order(SampleView.targetByteOrder);
}
for (int i = 0; i < count; i++)
Fetch(maxAttrib, first + i, i, arrays, msgData.attribs);
fetch(maxAttrib, first + i, i, arrays, msgData.attribs);
assert null == arrays || arrays.remaining() == 0;
}
@@ -419,12 +419,12 @@ public class GLServerVertex implements Cloneable {
if (GLEnum.GL_UNSIGNED_SHORT == type) {
for (int i = 0; i < count; i++) {
msgData.indices[i] = index.getShort();
Fetch(maxAttrib, msgData.indices[i] & 0xffff, i, arrays, msgData.attribs);
fetch(maxAttrib, msgData.indices[i] & 0xffff, i, arrays, msgData.attribs);
}
} else if (GLEnum.GL_UNSIGNED_BYTE == type) {
for (int i = 0; i < count; i++) {
msgData.indices[i] = (short) (index.get() & 0xff);
Fetch(maxAttrib, msgData.indices[i], i, arrays, msgData.attribs);
fetch(maxAttrib, msgData.indices[i], i, arrays, msgData.attribs);
}
} else
assert false;
@@ -458,7 +458,7 @@ public class GLServerVertex implements Cloneable {
attrib.type = GLEnum.valueOf(msg.getArg2());
attrib.normalized = msg.getArg3() != 0;
attrib.stride = msg.getArg4();
attrib.elemSize = attrib.size * TypeSize(attrib.type);
attrib.elemSize = attrib.size * typeSize(attrib.type);
if (attrib.stride == 0)
attrib.elemStride = attrib.elemSize;
else

16
tools/glesv2debugger/src/com/android/glesv2debugger/MessageData.java
View File

@@ -59,7 +59,7 @@ public class MessageData {
columns[2] = "[AfterGeneratedCall] ";
else
assert msg.getType() == Type.CompleteCall;
columns[2] += MessageFormatter.Format(msg, false);
columns[2] += MessageFormatter.format(msg, false);
builder.append(columns[2]);
switch (function) {
case glDrawArrays:
@@ -80,7 +80,7 @@ public class MessageData {
text = builder.toString();
}
public Image GetImage() {
public Image getImage() {
if (image != null)
return image;
ImageData imageData = null;
@@ -88,35 +88,35 @@ public class MessageData {
case glTexImage2D:
if (!msg.hasData())
return null;
imageData = MessageProcessor.ReceiveImage(msg.getArg3(), msg
imageData = MessageProcessor.receiveImage(msg.getArg3(), msg
.getArg4(), msg.getArg6(), msg.getArg7(), msg.getData());
return image = new Image(Display.getCurrent(), imageData);
case glTexSubImage2D:
assert msg.hasData();
imageData = MessageProcessor.ReceiveImage(msg.getArg4(), msg
imageData = MessageProcessor.receiveImage(msg.getArg4(), msg
.getArg5(), msg.getArg6(), msg.getArg7(), msg.getData());
return image = new Image(Display.getCurrent(), imageData);
case glCopyTexImage2D:
imageData = MessageProcessor.ReceiveImage(msg.getArg5(), msg.getArg6(),
imageData = MessageProcessor.receiveImage(msg.getArg5(), msg.getArg6(),
msg.getPixelFormat(), msg.getPixelType(), msg.getData());
imageData = imageData.scaledTo(imageData.width, -imageData.height);
return image = new Image(Display.getCurrent(), imageData);
case glCopyTexSubImage2D:
imageData = MessageProcessor.ReceiveImage(msg.getArg6(), msg.getArg7(),
imageData = MessageProcessor.receiveImage(msg.getArg6(), msg.getArg7(),
msg.getPixelFormat(), msg.getPixelType(), msg.getData());
imageData = imageData.scaledTo(imageData.width, -imageData.height);
return image = new Image(Display.getCurrent(), imageData);
case glReadPixels:
if (!msg.hasData())
return null;
imageData = MessageProcessor.ReceiveImage(msg.getArg2(), msg.getArg3(),
imageData = MessageProcessor.receiveImage(msg.getArg2(), msg.getArg3(),
msg.getArg4(), msg.getArg5(), msg.getData());
imageData = imageData.scaledTo(imageData.width, -imageData.height);
return image = new Image(Display.getCurrent(), imageData);
case eglSwapBuffers:
if (!msg.hasData())
return null;
imageData = MessageProcessor.ReceiveImage(msg.getImageWidth(),
imageData = MessageProcessor.receiveImage(msg.getImageWidth(),
msg.getImageHeight(), msg.getPixelFormat(), msg.getPixelType(),
msg.getData());
imageData = imageData.scaledTo(imageData.width, -imageData.height);

60
tools/glesv2debugger/src/com/android/glesv2debugger/MessageFormatter.java
View File

@@ -22,7 +22,7 @@ import java.nio.ByteBuffer;
public class MessageFormatter {
static String FormatFloats(int count, final ByteBuffer data) {
static String formatFloats(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -35,7 +35,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatInts(int count, final ByteBuffer data) {
static String formatInts(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -48,7 +48,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatUints(int count, final ByteBuffer data) {
static String formatUInts(int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -62,7 +62,7 @@ public class MessageFormatter {
return ret + "}";
}
static String FormatMatrix(int columns, int count, final ByteBuffer data) {
static String formatMatrix(int columns, int count, final ByteBuffer data) {
if (data.remaining() == 0)
return "{}";
data.order(SampleView.targetByteOrder);
@@ -77,7 +77,7 @@ public class MessageFormatter {
return ret + "}";
}
public static String Format(final DebuggerMessage.Message msg,
public static String format(final DebuggerMessage.Message msg,
final boolean code) {
String str;
switch (msg.getFunction()) {
@@ -368,7 +368,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*buffers*/ " : "buffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glDeleteFramebuffers:
str = String.format("%s(%s%s, %s%s)",
@@ -376,7 +376,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*framebuffers*/ " : "framebuffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glDeleteProgram:
str = String.format("%s(%s%s)",
@@ -390,7 +390,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*renderbuffers*/ " : "renderbuffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glDeleteShader:
str = String.format("%s(%s%s)",
@@ -404,7 +404,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*textures*/ " : "textures=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glDepthFunc:
str = String.format("%s(%s%s)",
@@ -529,7 +529,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*buffers*/ " : "buffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glGenerateMipmap:
str = String.format("%s(%s%s)",
@@ -543,7 +543,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*framebuffers*/ " : "framebuffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glGenRenderbuffers:
str = String.format("%s(%s%s, %s%s)",
@@ -551,7 +551,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*renderbuffers*/ " : "renderbuffers=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glGenTextures:
str = String.format("%s(%s%s, %s%s)",
@@ -559,7 +559,7 @@ public class MessageFormatter {
, (code ? "/*n*/ " : "n=")
, msg.getArg0()
, (code ? "/*textures*/ " : "textures=")
, (code ? "(GLuint [])" : "") + FormatUints(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLuint [])" : "") + formatUInts(1 * msg.getArg0(), msg.getData().asReadOnlyByteBuffer()));
break;
case glGetActiveAttrib:
// FIXME: this function uses pointers, debugger may send data in msg.data
@@ -684,7 +684,7 @@ public class MessageFormatter {
, (code ? "/*pname*/ " : "pname=")
, GLEnum.valueOf(msg.getArg1())
, (code ? "/*params*/ " : "params=")
, (code ? "(GLint [])" : "") + FormatInts(1, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(1, msg.getData().asReadOnlyByteBuffer()));
break;
case glGetProgramInfoLog:
// FIXME: this function uses pointers, debugger may send data in msg.data
@@ -718,7 +718,7 @@ public class MessageFormatter {
, (code ? "/*pname*/ " : "pname=")
, GLEnum.valueOf(msg.getArg1())
, (code ? "/*params*/ " : "params=")
, (code ? "(GLint [])" : "") + FormatInts(1, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(1, msg.getData().asReadOnlyByteBuffer()));
break;
case glGetShaderInfoLog:
// FIXME: this function uses pointers, debugger may send data in msg.data
@@ -1175,7 +1175,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLfloat [])" : "") + FormatFloats(1 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(1 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform1i:
str = String.format("%s(%s%s, %s%s)",
@@ -1193,7 +1193,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLint [])" : "") + FormatInts(1 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(1 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform2f:
str = String.format("%s(%s%s, %s%s, %s%s)",
@@ -1213,7 +1213,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLfloat [])" : "") + FormatFloats(2 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(2 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform2i:
str = String.format("%s(%s%s, %s%s, %s%s)",
@@ -1233,7 +1233,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLint [])" : "") + FormatInts(2 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(2 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform3f:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1255,7 +1255,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLfloat [])" : "") + FormatFloats(3 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(3 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform3i:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1277,7 +1277,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLint [])" : "") + FormatInts(3 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(3 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform4f:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s, %s%s)",
@@ -1301,7 +1301,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLfloat [])" : "") + FormatFloats(4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniform4i:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s, %s%s)",
@@ -1325,7 +1325,7 @@ public class MessageFormatter {
, (code ? "/*count*/ " : "count=")
, msg.getArg1()
, (code ? "/*v*/ " : "v=")
, (code ? "(GLint [])" : "") + FormatInts(4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLint [])" : "") + formatInts(4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniformMatrix2fv:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1337,7 +1337,7 @@ public class MessageFormatter {
, (code ? "/*transpose*/ " : "transpose=")
, msg.getArg2()
, (code ? "/*value*/ " : "value=")
, (code ? "(GLfloat [])" : "") + FormatMatrix(2, 4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatMatrix(2, 4 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniformMatrix3fv:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1349,7 +1349,7 @@ public class MessageFormatter {
, (code ? "/*transpose*/ " : "transpose=")
, msg.getArg2()
, (code ? "/*value*/ " : "value=")
, (code ? "(GLfloat [])" : "") + FormatMatrix(3, 9 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatMatrix(3, 9 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUniformMatrix4fv:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1361,7 +1361,7 @@ public class MessageFormatter {
, (code ? "/*transpose*/ " : "transpose=")
, msg.getArg2()
, (code ? "/*value*/ " : "value=")
, (code ? "(GLfloat [])" : "") + FormatMatrix(4, 16 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatMatrix(4, 16 * msg.getArg1(), msg.getData().asReadOnlyByteBuffer()));
break;
case glUseProgram:
str = String.format("%s(%s%s)",
@@ -1389,7 +1389,7 @@ public class MessageFormatter {
, (code ? "/*indx*/ " : "indx=")
, msg.getArg0()
, (code ? "/*values*/ " : "values=")
, (code ? "(GLfloat [])" : "") + FormatFloats(1, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(1, msg.getData().asReadOnlyByteBuffer()));
break;
case glVertexAttrib2f:
str = String.format("%s(%s%s, %s%s, %s%s)",
@@ -1407,7 +1407,7 @@ public class MessageFormatter {
, (code ? "/*indx*/ " : "indx=")
, msg.getArg0()
, (code ? "/*values*/ " : "values=")
, (code ? "(GLfloat [])" : "") + FormatFloats(2, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(2, msg.getData().asReadOnlyByteBuffer()));
break;
case glVertexAttrib3f:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s)",
@@ -1427,7 +1427,7 @@ public class MessageFormatter {
, (code ? "/*indx*/ " : "indx=")
, msg.getArg0()
, (code ? "/*values*/ " : "values=")
, (code ? "(GLfloat [])" : "") + FormatFloats(3, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(3, msg.getData().asReadOnlyByteBuffer()));
break;
case glVertexAttrib4f:
str = String.format("%s(%s%s, %s%s, %s%s, %s%s, %s%s)",
@@ -1449,7 +1449,7 @@ public class MessageFormatter {
, (code ? "/*indx*/ " : "indx=")
, msg.getArg0()
, (code ? "/*values*/ " : "values=")
, (code ? "(GLfloat [])" : "") + FormatFloats(4, msg.getData().asReadOnlyByteBuffer()));
, (code ? "(GLfloat [])" : "") + formatFloats(4, msg.getData().asReadOnlyByteBuffer()));
break;
case glVertexAttribPointer:
// FIXME: this function uses pointers, debugger may send data in msg.data

666
tools/glesv2debugger/src/com/android/glesv2debugger/MessageParser.java
View File

File diff suppressed because it is too large Load Diff

281
tools/glesv2debugger/src/com/android/glesv2debugger/MessageParserEx.java
View File

@@ -23,281 +23,282 @@ import com.android.glesv2debugger.DebuggerMessage.Message;
public class MessageParserEx extends MessageParser {
@Override
void Parse_glBufferData(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLsizeiptr size
void parse_glBufferData(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLsizeiptr size
// TODO // GLvoid data
builder.setArg3(ParseArgument()); // GLenum usage
builder.setArg3(parseArgument()); // GLenum usage
}
@Override
void Parse_glBufferSubData(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLintptr offset
builder.setArg2(ParseArgument()); // GLsizeiptr size
void parse_glBufferSubData(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLintptr offset
builder.setArg2(parseArgument()); // GLsizeiptr size
// TODO // GLvoid data
}
@Override
void Parse_glCompressedTexImage2D(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLint level
builder.setArg2(ParseArgument()); // GLenum internalformat
builder.setArg3(ParseArgument()); // GLsizei width
builder.setArg4(ParseArgument()); // GLsizei height
builder.setArg5(ParseArgument()); // GLint border
builder.setArg6(ParseArgument()); // GLsizei imageSize
void parse_glCompressedTexImage2D(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLint level
builder.setArg2(parseArgument()); // GLenum internalformat
builder.setArg3(parseArgument()); // GLsizei width
builder.setArg4(parseArgument()); // GLsizei height
builder.setArg5(parseArgument()); // GLint border
builder.setArg6(parseArgument()); // GLsizei imageSize
// TODO: GLvoid* data
}
@Override
void Parse_glCompressedTexSubImage2D(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLint level
builder.setArg2(ParseArgument()); // GLint xoffset
builder.setArg3(ParseArgument()); // GLint yoffset
builder.setArg4(ParseArgument()); // GLsizei width
builder.setArg5(ParseArgument()); // GLsizei height
builder.setArg6(ParseArgument()); // GLenum format
builder.setArg7(ParseArgument()); // GLsizei imageSize
void parse_glCompressedTexSubImage2D(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLint level
builder.setArg2(parseArgument()); // GLint xoffset
builder.setArg3(parseArgument()); // GLint yoffset
builder.setArg4(parseArgument()); // GLsizei width
builder.setArg5(parseArgument()); // GLsizei height
builder.setArg6(parseArgument()); // GLenum format
builder.setArg7(parseArgument()); // GLsizei imageSize
// TODO: GLvoid* data
}
@Override
void Parse_glDrawElements(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum mode
builder.setArg1(ParseArgument()); // GLsizei count
builder.setArg2(ParseArgument()); // GLenum type
void parse_glDrawElements(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum mode
builder.setArg1(parseArgument()); // GLsizei count
builder.setArg2(parseArgument()); // GLenum type
// TODO: GLvoid* indices
}
@Override
void Parse_glGetActiveAttrib(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLuint index
builder.setArg2(ParseArgument()); // GLsizei bufsize
void parse_glGetActiveAttrib(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLuint index
builder.setArg2(parseArgument()); // GLsizei bufsize
// TODO: GLsizei* length
// TODO: GLint* size
// TODO: GLenum* type
builder.setData(ParseString()); // GLchar name
builder.setData(parseString()); // GLchar name
}
@Override
void Parse_glGetActiveUniform(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLuint index
builder.setArg2(ParseArgument()); // GLsizei bufsize
void parse_glGetActiveUniform(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLuint index
builder.setArg2(parseArgument()); // GLsizei bufsize
// TODO: GLsizei* length
// TODO: GLint* size
// TODO: GLenum* type
builder.setData(ParseString()); // GLchar name
builder.setData(parseString()); // GLchar name
}
@Override
void Parse_glGetAttachedShaders(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLsizei maxcount
void parse_glGetAttachedShaders(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLsizei maxcount
// TODO: GLsizei* count
// TODO: GLuint* shaders
}
@Override
void Parse_glGetBooleanv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum pname
void parse_glGetBooleanv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum pname
// TODO: GLboolean* params
}
@Override
void Parse_glGetBufferParameteriv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetBufferParameteriv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetFloatv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum pname
void parse_glGetFloatv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum pname
// TODO: GLfloat* params
}
@Override
void Parse_glGetFramebufferAttachmentParameteriv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum attachment
builder.setArg2(ParseArgument()); // GLenum pname
void parse_glGetFramebufferAttachmentParameteriv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum attachment
builder.setArg2(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetIntegerv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum pname
void parse_glGetIntegerv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetProgramInfoLog(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLsizei bufsize
void parse_glGetProgramInfoLog(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLsizei bufsize
// TODO: GLsizei* length
builder.setData(ParseString()); // GLchar infolog
builder.setData(parseString()); // GLchar infolog
}
@Override
void Parse_glGetRenderbufferParameteriv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetRenderbufferParameteriv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetShaderInfoLog(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint shader
builder.setArg1(ParseArgument()); // GLsizei bufsize
void parse_glGetShaderInfoLog(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint shader
builder.setArg1(parseArgument()); // GLsizei bufsize
// TODO: GLsizei* length
builder.setData(ParseString()); // GLchar infolog
builder.setData(parseString()); // GLchar infolog
}
@Override
void Parse_glGetShaderPrecisionFormat(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum shadertype
builder.setArg1(ParseArgument()); // GLenum precisiontype
void parse_glGetShaderPrecisionFormat(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum shadertype
builder.setArg1(parseArgument()); // GLenum precisiontype
// TODO: GLint* range
// TODO: GLint* precision
}
@Override
void Parse_glGetShaderSource(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint shader
builder.setArg1(ParseArgument()); // GLsizei bufsize
void parse_glGetShaderSource(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint shader
builder.setArg1(parseArgument()); // GLsizei bufsize
// TODO: GLsizei* length
builder.setData(ParseString()); // GLchar source
builder.setData(parseString()); // GLchar source
}
@Override
void Parse_glGetTexParameterfv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetTexParameterfv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLfloat* params
}
@Override
void Parse_glGetTexParameteriv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetTexParameteriv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetUniformfv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLint location
void parse_glGetUniformfv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLint location
// TODO: GLfloat* params
}
@Override
void Parse_glGetUniformiv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint program
builder.setArg1(ParseArgument()); // GLint location
void parse_glGetUniformiv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint program
builder.setArg1(parseArgument()); // GLint location
// TODO: GLint* params
}
@Override
void Parse_glGetVertexAttribfv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint index
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetVertexAttribfv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint index
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLfloat* params
}
@Override
void Parse_glGetVertexAttribiv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint index
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetVertexAttribiv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint index
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glGetVertexAttribPointerv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint index
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glGetVertexAttribPointerv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint index
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLvoid** pointer
}
@Override
void Parse_glReadPixels(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLint x
builder.setArg1(ParseArgument()); // GLint y
builder.setArg2(ParseArgument()); // GLsizei width
builder.setArg3(ParseArgument()); // GLsizei height
builder.setArg4(ParseArgument()); // GLenum format
builder.setArg5(ParseArgument()); // GLenum type
void parse_glReadPixels(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLint x
builder.setArg1(parseArgument()); // GLint y
builder.setArg2(parseArgument()); // GLsizei width
builder.setArg3(parseArgument()); // GLsizei height
builder.setArg4(parseArgument()); // GLenum format
builder.setArg5(parseArgument()); // GLenum type
// TODO: GLvoid* pixels
}
@Override
void Parse_glShaderBinary(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLsizei n
void parse_glShaderBinary(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLsizei n
// TODO: GLuint* shaders
builder.setArg2(ParseArgument()); // GLenum binaryformat
builder.setArg2(parseArgument()); // GLenum binaryformat
// TODO: GLvoid* binary
builder.setArg4(ParseArgument()); // GLsizei length
builder.setArg4(parseArgument()); // GLsizei length
}
@Override
void Parse_glShaderSource(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint shader
builder.setArg1(ParseArgument()); // GLsizei count
void parse_glShaderSource(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint shader
builder.setArg1(parseArgument()); // GLsizei count
assert 1 == builder.getArg1();
builder.setData(ParseString()); // GLchar** string
builder.setArg3(ParseArgument());// not used, always 1 null terminated string; GLint* length
builder.setData(parseString()); // GLchar** string
builder.setArg3(parseArgument());// not used, always 1 null terminated
// string; GLint* length
}
@Override
void Parse_glTexImage2D(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLint level
builder.setArg2(ParseArgument()); // GLint internalformat
builder.setArg3(ParseArgument()); // GLsizei width
builder.setArg4(ParseArgument()); // GLsizei height
builder.setArg5(ParseArgument()); // GLint border
builder.setArg6(ParseArgument()); // GLenum format
builder.setArg7(ParseArgument()); // GLenum type
void parse_glTexImage2D(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLint level
builder.setArg2(parseArgument()); // GLint internalformat
builder.setArg3(parseArgument()); // GLsizei width
builder.setArg4(parseArgument()); // GLsizei height
builder.setArg5(parseArgument()); // GLint border
builder.setArg6(parseArgument()); // GLenum format
builder.setArg7(parseArgument()); // GLenum type
// TODO: GLvoid* pixels
}
@Override
void Parse_glTexParameterfv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glTexParameterfv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLfloat* params
}
@Override
void Parse_glTexParameteriv(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLenum pname
void parse_glTexParameteriv(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLenum pname
// TODO: GLint* params
}
@Override
void Parse_glTexSubImage2D(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLenum target
builder.setArg1(ParseArgument()); // GLint level
builder.setArg2(ParseArgument()); // GLint xoffset
builder.setArg3(ParseArgument()); // GLint yoffset
builder.setArg4(ParseArgument()); // GLsizei width
builder.setArg5(ParseArgument()); // GLsizei height
builder.setArg6(ParseArgument()); // GLenum format
builder.setArg7(ParseArgument()); // GLenum type
void parse_glTexSubImage2D(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLenum target
builder.setArg1(parseArgument()); // GLint level
builder.setArg2(parseArgument()); // GLint xoffset
builder.setArg3(parseArgument()); // GLint yoffset
builder.setArg4(parseArgument()); // GLsizei width
builder.setArg5(parseArgument()); // GLsizei height
builder.setArg6(parseArgument()); // GLenum format
builder.setArg7(parseArgument()); // GLenum type
// TODO: GLvoid* pixels
}
@Override
void Parse_glVertexAttribPointer(Message.Builder builder) {
builder.setArg0(ParseArgument()); // GLuint indx
builder.setArg1(ParseArgument()); // GLint size
builder.setArg2(ParseArgument()); // GLenum type
builder.setArg3(ParseArgument()); // GLboolean normalized
builder.setArg4(ParseArgument()); // GLsizei stride
void parse_glVertexAttribPointer(Message.Builder builder) {
builder.setArg0(parseArgument()); // GLuint indx
builder.setArg1(parseArgument()); // GLint size
builder.setArg2(parseArgument()); // GLenum type
builder.setArg3(parseArgument()); // GLboolean normalized
builder.setArg4(parseArgument()); // GLsizei stride
// TODO: GLvoid* ptr
}

10
tools/glesv2debugger/src/com/android/glesv2debugger/MessageProcessor.java
View File

@@ -36,7 +36,7 @@ public class MessageProcessor {
* decompressed size, uint32 chunk compressed size, chunk data)+. 0 chunk
* compressed size means chunk is not compressed
*/
public static byte[] LZFDecompressChunks(final ByteString data) {
public static byte[] lzfDecompressChunks(final ByteString data) {
ByteBuffer in = data.asReadOnlyByteBuffer();
in.order(SampleView.targetByteOrder);
ByteBuffer out = ByteBuffer.allocate(in.getInt());
@@ -65,7 +65,7 @@ public class MessageProcessor {
}
/** same data layout as LZFDecompressChunks */
public static byte[] LZFCompressChunks(final byte[] in, final int inSize) {
public static byte[] lzfCompressChunks(final byte[] in, final int inSize) {
byte[] chunk = new byte[256 * 1024]; // chunk size is arbitrary
final ByteBuffer out = ByteBuffer.allocate(4 + (inSize + chunk.length - 1)
/ chunk.length * (chunk.length + 4 * 2));
@@ -92,7 +92,7 @@ public class MessageProcessor {
* returns new ref, which is also the decoded image; ref could be bigger
* than pixels, in which case the first pixels.length bytes form the image
*/
public static byte[] DecodeReferencedImage(byte[] ref, byte[] pixels) {
public static byte[] decodeReferencedImage(byte[] ref, byte[] pixels) {
if (ref.length < pixels.length)
ref = new byte[pixels.length];
for (int i = 0; i < pixels.length; i++)
@@ -102,7 +102,7 @@ public class MessageProcessor {
return ref;
}
public static ImageData ReceiveImage(int width, int height, int format,
public static ImageData receiveImage(int width, int height, int format,
int type, final ByteString data) {
assert width > 0 && height > 0;
int bpp = 0;
@@ -165,7 +165,7 @@ public class MessageProcessor {
showError("unsupported texture format: " + format);
return null;
}
byte[] pixels = LZFDecompressChunks(data);
byte[] pixels = lzfDecompressChunks(data);
assert pixels.length == width * height * (bpp / 8);
PaletteData palette = new PaletteData(redMask, greenMask, blueMask);
return new ImageData(width, height, bpp, palette, 1, pixels);

58
tools/glesv2debugger/src/com/android/glesv2debugger/MessageQueue.java
View File

@@ -44,7 +44,7 @@ public class MessageQueue implements Runnable {
this.sampleView = sampleView;
}
public void Start(final ByteOrder byteOrder, final FileInputStream file) {
public void start(final ByteOrder byteOrder, final FileInputStream file) {
if (running)
return;
running = true;
@@ -54,29 +54,29 @@ public class MessageQueue implements Runnable {
thread.start();
}
public void Stop() {
public void stop() {
if (!running)
return;
running = false;
}
public boolean IsRunning() {
public boolean isRunning() {
return running;
}
private void SendCommands(final int contextId) throws IOException {
private void sendCommands(final int contextId) throws IOException {
synchronized (commands) {
for (int i = 0; i < commands.size(); i++) {
Message command = commands.get(i);
if (command.getContextId() == contextId || command.getContextId() == 0) {
SendMessage(commands.remove(i));
sendMessage(commands.remove(i));
i--;
}
}
}
}
public void AddCommand(Message command) {
public void addCommand(Message command) {
synchronized (commands) {
commands.add(command);
}
@@ -128,8 +128,8 @@ public class MessageQueue implements Runnable {
}
try {
if (null == msg) // get incoming from network
msg = ReceiveMessage(dis);
ProcessMessage(dos, msg);
msg = receiveMessage(dis);
processMessage(dos, msg);
} catch (IOException e) {
Error(e);
running = false;
@@ -149,35 +149,35 @@ public class MessageQueue implements Runnable {
}
private void PutMessage(final Message msg) {
private void putMessage(final Message msg) {
ArrayList<Message> existing = incoming.get(msg.getContextId());
if (existing == null)
incoming.put(msg.getContextId(), existing = new ArrayList<Message>());
existing.add(msg);
}
Message ReceiveMessage(final int contextId) throws IOException {
Message msg = ReceiveMessage(dis);
Message receiveMessage(final int contextId) throws IOException {
Message msg = receiveMessage(dis);
while (msg.getContextId() != contextId) {
PutMessage(msg);
msg = ReceiveMessage(dis);
putMessage(msg);
msg = receiveMessage(dis);
}
return msg;
}
void SendMessage(final Message msg) throws IOException {
SendMessage(dos, msg);
void sendMessage(final Message msg) throws IOException {
sendMessage(dos, msg);
}
// should only be used by DefaultProcessMessage
private SparseArray<Message> partials = new SparseArray<Message>();
Message GetPartialMessage(final int contextId) {
Message getPartialMessage(final int contextId) {
return partials.get(contextId);
}
// used to add BeforeCall to complete if it was skipped
void CompletePartialMessage(final int contextId) {
void completePartialMessage(final int contextId) {
final Message msg = partials.get(contextId);
partials.remove(contextId);
assert msg != null;
@@ -188,7 +188,7 @@ public class MessageQueue implements Runnable {
}
// can be used by other message processor as default processor
void DefaultProcessMessage(final Message msg, boolean expectResponse,
void defaultProcessMessage(final Message msg, boolean expectResponse,
boolean sendResponse)
throws IOException {
final int contextId = msg.getContextId();
@@ -199,7 +199,7 @@ public class MessageQueue implements Runnable {
builder.setType(Type.Response);
builder.setExpectResponse(expectResponse);
builder.setFunction(Function.CONTINUE);
SendMessage(dos, builder.build());
sendMessage(dos, builder.build());
}
assert partials.indexOfKey(contextId) < 0;
partials.put(contextId, msg);
@@ -210,7 +210,7 @@ public class MessageQueue implements Runnable {
builder.setType(Type.Response);
builder.setExpectResponse(expectResponse);
builder.setFunction(Function.SKIP);
SendMessage(dos, builder.build());
sendMessage(dos, builder.build());
}
assert partials.indexOfKey(contextId) >= 0;
final Message before = partials.get(contextId);
@@ -234,7 +234,7 @@ public class MessageQueue implements Runnable {
assert false;
}
public Message RemoveCompleteMessage(int contextId) {
public Message removeCompleteMessage(int contextId) {
synchronized (complete) {
if (complete.size() == 0)
return null;
@@ -251,7 +251,7 @@ public class MessageQueue implements Runnable {
return null;
}
private Message ReceiveMessage(final DataInputStream dis)
private Message receiveMessage(final DataInputStream dis)
throws IOException {
int len = 0;
try {
@@ -277,11 +277,11 @@ public class MessageQueue implements Runnable {
readLen += read;
}
Message msg = Message.parseFrom(buffer);
SendCommands(msg.getContextId());
sendCommands(msg.getContextId());
return msg;
}
private void SendMessage(final DataOutputStream dos, final Message message)
private void sendMessage(final DataOutputStream dos, final Message message)
throws IOException {
if (dos == null)
return;
@@ -294,17 +294,17 @@ public class MessageQueue implements Runnable {
dos.write(data);
}
private void ProcessMessage(final DataOutputStream dos, final Message msg) throws IOException {
private void processMessage(final DataOutputStream dos, final Message msg) throws IOException {
if (msg.getExpectResponse()) {
assert file == null; // file cannot be interactive mode
if (sampleView.shaderEditor.ProcessMessage(this, msg))
if (sampleView.shaderEditor.processMessage(this, msg))
return;
else if (sampleView.breakpointOption.ProcessMessage(this, msg))
else if (sampleView.breakpointOption.processMessage(this, msg))
return;
else
DefaultProcessMessage(msg, msg.getExpectResponse(), msg.getExpectResponse());
defaultProcessMessage(msg, msg.getExpectResponse(), msg.getExpectResponse());
} else
DefaultProcessMessage(msg, msg.getExpectResponse(), msg.getExpectResponse());
defaultProcessMessage(msg, msg.getExpectResponse(), msg.getExpectResponse());
}
void Error(Exception e) {

96
tools/glesv2debugger/src/com/android/glesv2debugger/SampleView.java
View File

@@ -138,7 +138,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
@Override
public Object[] getElements(Object parent) {
return frame.Get().toArray();
return frame.get().toArray();
}
@Override
@@ -150,7 +150,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
@Override
public Image getImage(Object obj) {
MessageData msgData = (MessageData) obj;
return msgData.GetImage();
return msgData.getImage();
}
@Override
@@ -166,7 +166,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
if (index > -1)
return null;
MessageData msgData = (MessageData) obj;
return msgData.GetImage();
return msgData.getImage();
}
}
@@ -196,13 +196,13 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
public SampleView() {
MessageParserEx messageParserEx = new MessageParserEx();
Message.Builder builder = Message.newBuilder();
messageParserEx.Parse(builder, "glUniform4fv(1,2,{0,1,2,3,4,5,6,7})");
messageParserEx.parse(builder, "glUniform4fv(1,2,{0,1,2,3,4,5,6,7})");
messageParserEx
.Parse(builder,
.parse(builder,
"void glShaderSource(shader=4, count=1, string=\"dksjafhskjahourehghskjg\", length=0x0)");
}
public void CreateLeftPane(Composite parent) {
public void createLeftPane(Composite parent) {
Composite composite = new Composite(parent, 0);
GridLayout gridLayout = new GridLayout();
@@ -270,7 +270,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
*/
@Override
public void createPartControl(Composite parent) {
CreateLeftPane(parent);
createLeftPane(parent);
// Create the help context id for the viewer's control
PlatformUI.getWorkbench().getHelpSystem()
@@ -431,8 +431,8 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
@Override
public void run() {
if (!running)
ChangeContext(null); // viewer will switch to newest context
ConnectDisconnect();
changeContext(null); // viewer will switch to newest context
connectDisconnect();
}
};
manager.add(actionConnect);
@@ -444,8 +444,8 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
{
if (!running)
{
ChangeContext(null); // viewer will switch to newest context
OpenFile();
changeContext(null); // viewer will switch to newest context
openFile();
}
}
});
@@ -501,7 +501,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
builder.setFunction(Function.SETPROP);
builder.setProp(Prop.CaptureDraw);
builder.setArg0(Integer.parseInt(inputDialog.getValue()));
messageQueue.AddCommand(builder.build());
messageQueue.addCommand(builder.build());
}
});
@@ -527,7 +527,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
builder.setFunction(Function.SETPROP);
builder.setProp(Prop.CaptureSwap);
builder.setArg0(Integer.parseInt(inputDialog.getValue()));
messageQueue.AddCommand(builder.build());
messageQueue.addCommand(builder.build());
}
});
@@ -549,7 +549,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
builder.setFunction(Message.Function.SETPROP);
builder.setProp(Prop.TimeMode);
builder.setArg0(i);
messageQueue.AddCommand(builder.build());
messageQueue.addCommand(builder.build());
this.setText(timeModes[i]);
manager.update(true);
}
@@ -567,7 +567,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
final int contextId = Integer.parseInt(idStr, 16);
int index = debugContexts.indexOfKey(contextId);
index = (index + 1) % debugContexts.size();
ChangeContext(debugContexts.valueAt(index));
changeContext(debugContexts.valueAt(index));
}
};
manager.add(actContext);
@@ -593,9 +593,9 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
{
if (current != null)
{
new CodeGen().CodeGenFrame((Frame) viewer.getInput());
new CodeGen().codeGenFrame((Frame) viewer.getInput());
// need to reload current frame
viewer.setInput(current.GetFrame(frameNum.getSelection()));
viewer.setInput(current.getFrame(frameNum.getSelection()));
}
}
});
@@ -607,16 +607,16 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
{
if (current != null)
{
new CodeGen().CodeGenFrames(current, frameNum.getSelection() + 1,
new CodeGen().codeGenFrames(current, frameNum.getSelection() + 1,
getSite().getShell());
// need to reload current frame
viewer.setInput(current.GetFrame(frameNum.getSelection()));
viewer.setInput(current.getFrame(frameNum.getSelection()));
}
}
});
}
private void OpenFile() {
private void openFile() {
FileDialog dialog = new FileDialog(getSite().getShell(), SWT.OPEN);
dialog.setText("Open");
dialog.setFilterExtensions(new String[] {
@@ -633,23 +633,23 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
return;
}
running = true;
messageQueue.Start(targetByteOrder, file);
messageQueue.start(targetByteOrder, file);
thread = new Thread(this);
thread.start();
actionConnect.setText("Disconnect");
getViewSite().getActionBars().getToolBarManager().update(true);
}
private void ConnectDisconnect() {
private void connectDisconnect() {
if (!running) {
running = true;
messageQueue.Start(targetByteOrder, null);
messageQueue.start(targetByteOrder, null);
thread = new Thread(this);
thread.start();
actionConnect.setText("Disconnect");
} else {
running = false;
messageQueue.Stop();
messageQueue.stop();
actionConnect.setText("Connect");
}
this.getSite().getShell().getDisplay().syncExec(new Runnable() {
@@ -660,16 +660,16 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
});
}
void MessageDataSelected(final MessageData msgData) {
void messageDataSelected(final MessageData msgData) {
if (null == msgData)
return;
if (frameNum.getSelection() == frameNum.getMaximum())
return; // scale max cannot overlap min, so max is array size
final Frame frame = current.GetFrame(frameNum.getSelection());
final Context context = frame.ComputeContext(msgData);
final Frame frame = current.getFrame(frameNum.getSelection());
final Context context = frame.computeContext(msgData);
contextViewer.setInput(context);
if (msgData.GetImage() != null) {
canvas.setBackgroundImage(msgData.GetImage());
if (msgData.getImage() != null) {
canvas.setBackgroundImage(msgData.getImage());
tabFolder.setSelection(tabItemImage);
canvas.redraw();
} else if (null != msgData.shader) {
@@ -705,7 +705,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
if (null == selection)
return;
MessageData msgData = (MessageData) selection.getFirstElement();
MessageDataSelected(msgData);
messageDataSelected(msgData);
}
});
}
@@ -734,8 +734,8 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
boolean shaderEditorUpdate = false;
while (running) {
final Message oriMsg = messageQueue.RemoveCompleteMessage(0);
if (oriMsg == null && !messageQueue.IsRunning())
final Message oriMsg = messageQueue.removeCompleteMessage(0);
if (oriMsg == null && !messageQueue.isRunning())
break;
if (newMessages > 60 || (newMessages > 0 && null == oriMsg)) {
newMessages = 0;
@@ -743,15 +743,15 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
getSite().getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
if (frameNum.getSelection() == current.FrameCount() - 1 ||
frameNum.getSelection() == current.FrameCount() - 2)
if (frameNum.getSelection() == current.frameCount() - 1 ||
frameNum.getSelection() == current.frameCount() - 2)
{
viewer.refresh(false);
if (actionAutoScroll.isChecked())
viewer.getList().setSelection(
viewer.getList().getItemCount() - 1);
}
frameNum.setMaximum(current.FrameCount());
frameNum.setMaximum(current.frameCount());
}
});
current.uiUpdate = false;
@@ -760,7 +760,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
this.getSite().getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
shaderEditor.Update();
shaderEditor.updateUI();
}
});
shaderEditorUpdate = false;
@@ -778,32 +778,32 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
debugContext = new DebugContext(oriMsg.getContextId());
debugContexts.put(oriMsg.getContextId(), debugContext);
}
debugContext.ProcessMessage(oriMsg);
debugContext.processMessage(oriMsg);
shaderEditorUpdate |= debugContext.currentContext.serverShader.uiUpdate;
debugContext.currentContext.serverShader.uiUpdate = false;
if (current == null)
ChangeContext(debugContext);
changeContext(debugContext);
newMessages++;
}
if (running)
ConnectDisconnect(); // error occurred, disconnect
connectDisconnect(); // error occurred, disconnect
}
/** can be called from non-UI thread */
void ChangeContext(final DebugContext newContext) {
void changeContext(final DebugContext newContext) {
getSite().getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
current = newContext;
if (current != null)
{
frameNum.setMaximum(current.FrameCount());
if (frameNum.getSelection() >= current.FrameCount())
if (current.FrameCount() > 0)
frameNum.setSelection(current.FrameCount() - 1);
frameNum.setMaximum(current.frameCount());
if (frameNum.getSelection() >= current.frameCount())
if (current.frameCount() > 0)
frameNum.setSelection(current.frameCount() - 1);
else
frameNum.setSelection(0);
viewer.setInput(current.GetFrame(frameNum.getSelection()));
viewer.setInput(current.getFrame(frameNum.getSelection()));
actContext.setText("Context: 0x" + Integer.toHexString(current.contextId));
}
else
@@ -813,7 +813,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
viewer.setInput(null);
actContext.setText("Context: 0x");
}
shaderEditor.Update();
shaderEditor.updateUI();
getViewSite().getActionBars().getToolBarManager().update(true);
}
});
@@ -825,9 +825,9 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
assert false;
if (current == null)
return;
if (frameNum.getSelection() == current.FrameCount())
if (frameNum.getSelection() == current.frameCount())
return; // scale maximum cannot overlap minimum
Frame frame = current.GetFrame(frameNum.getSelection());
Frame frame = current.getFrame(frameNum.getSelection());
viewer.setInput(frame);
}

48
tools/glesv2debugger/src/com/android/glesv2debugger/ShaderEditor.java
View File

@@ -100,7 +100,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
styledText.addExtendedModifyListener(this);
}
public void Update() {
public void updateUI() {
list.removeAll();
String progs = "Current Programs: ";
for (int j = 0; j < sampleView.debugContexts.size(); j++) {
@@ -142,7 +142,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
toolbar.update();
}
void UploadShader() {
void uploadShader() {
current.source = styledText.getText();
try {
@@ -195,14 +195,14 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
}
shadersToUpload.add(current);
final int contextId = current.context.context.contextId;
Message.Builder builder = GetBuilder(contextId);
MessageParserEx.instance.Parse(builder,
Message.Builder builder = getBuilder(contextId);
MessageParserEx.instance.parse(builder,
String.format("glShaderSource(%d,1,\"%s\",0)", current.name, current.source));
sampleView.messageQueue.AddCommand(builder.build());
sampleView.messageQueue.addCommand(builder.build());
}
}
Message.Builder GetBuilder(int contextId) {
Message.Builder getBuilder(int contextId) {
Message.Builder builder = Message.newBuilder();
builder.setContextId(contextId);
builder.setType(Type.Response);
@@ -210,13 +210,13 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
return builder;
}
Message ExchangeMessage(final int contextId, final MessageQueue queue,
Message exchangeMessage(final int contextId, final MessageQueue queue,
String format, Object... args) throws IOException {
Message.Builder builder = GetBuilder(contextId);
MessageParserEx.instance.Parse(builder, String.format(format, args));
Message.Builder builder = getBuilder(contextId);
MessageParserEx.instance.parse(builder, String.format(format, args));
final Function function = builder.getFunction();
queue.SendMessage(builder.build());
final Message msg = queue.ReceiveMessage(contextId);
queue.sendMessage(builder.build());
final Message msg = queue.receiveMessage(contextId);
assert msg.getContextId() == contextId;
assert msg.getType() == Type.AfterGeneratedCall;
assert msg.getFunction() == function;
@@ -224,7 +224,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
}
// this is called from network thread
public boolean ProcessMessage(final MessageQueue queue, final Message msg)
public boolean processMessage(final MessageQueue queue, final Message msg)
throws IOException {
GLShader shader = null;
final int contextId = msg.getContextId();
@@ -252,15 +252,15 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
assert msg.getType() == Type.AfterGeneratedCall;
assert msg.getFunction() == Function.glShaderSource;
ExchangeMessage(contextId, queue, "glCompileShader(%d)", shader.name);
exchangeMessage(contextId, queue, "glCompileShader(%d)", shader.name);
// the 0, "" and {0} are dummies for the parser
Message rcv = ExchangeMessage(contextId, queue,
Message rcv = exchangeMessage(contextId, queue,
"glGetShaderiv(%d, GL_COMPILE_STATUS, {0})", shader.name);
assert rcv.hasData();
if (rcv.getData().asReadOnlyByteBuffer().getInt() == 0) {
// compile failed
rcv = ExchangeMessage(contextId, queue,
rcv = exchangeMessage(contextId, queue,
"glGetShaderInfoLog(%d, 0, 0, \"\")", shader.name);
final String title = String.format("Shader %d in 0x%s failed to compile",
shader.name, Integer.toHexString(shader.context.context.contextId));
@@ -274,15 +274,15 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
});
} else
for (int programName : shader.programs) {
GLProgram program = shader.context.GetProgram(programName);
ExchangeMessage(contextId, queue, "glLinkProgram(%d)", program.name);
rcv = ExchangeMessage(contextId, queue,
GLProgram program = shader.context.getProgram(programName);
exchangeMessage(contextId, queue, "glLinkProgram(%d)", program.name);
rcv = exchangeMessage(contextId, queue,
"glGetProgramiv(%d, GL_LINK_STATUS, {0})", program.name);
assert rcv.hasData();
if (rcv.getData().asReadOnlyByteBuffer().getInt() != 0)
continue;
// link failed
rcv = ExchangeMessage(contextId, queue,
rcv = exchangeMessage(contextId, queue,
"glGetProgramInfoLog(%d, 0, 0, \"\")", program.name);
final String title = String.format("Program %d in 0x%s failed to link",
program.name, Integer.toHexString(program.context.context.contextId));
@@ -299,14 +299,14 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
// TODO: add to upload results if failed
Message.Builder builder = GetBuilder(contextId);
Message.Builder builder = getBuilder(contextId);
builder.setExpectResponse(false);
if (queue.GetPartialMessage(contextId) != null)
if (queue.getPartialMessage(contextId) != null)
// the glShaderSource interrupted a BeforeCall, so continue
builder.setFunction(Function.CONTINUE);
else
builder.setFunction(Function.SKIP);
queue.SendMessage(builder.build());
queue.sendMessage(builder.build());
return true;
}
@@ -314,7 +314,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
@Override
public void widgetSelected(SelectionEvent e) {
if (e.getSource() == uploadShader && null != current) {
UploadShader();
uploadShader();
return;
} else if (e.getSource() == restoreShader && null != current) {
current.source = styledText.getText();
@@ -332,7 +332,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
null, "Shader source has been edited", MessageDialog.QUESTION, btns, 0);
int rc = dialog.open();
if (rc == SWT.DEFAULT || rc == 0)
UploadShader();
uploadShader();
else if (rc == 1)
current.source = styledText.getText();
// else if (rc == 2) do nothing; selection is changing