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

GLES2Dbg: use GL implementation constants sent from server

Browse Source 
Change-Id: I29d48a3e1454a284e714bc3b2f9e6350b0085c21
Signed-off-by: David Li <davidxli@google.com>
This commit is contained in:
David Li
2011-04-19 15:33:41 -07:00
parent 7698df91fa
commit 9df3fc14d2
6 changed files with 85 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.glesv2debugger;
import com.android.glesv2debugger.DebuggerMessage.Message;
import com.android.glesv2debugger.DebuggerMessage.Message.DataType;
import com.android.glesv2debugger.DebuggerMessage.Message.Function;
import com.android.glesv2debugger.DebuggerMessage.Message.Prop;
import com.android.sdklib.util.SparseArray;
import com.android.sdklib.util.SparseIntArray;
import com.google.protobuf.ByteString;
@@ -136,37 +137,17 @@ class DebugContext {
try {
file = new RandomAccessFile("0x" + Integer.toHexString(contextId) +
".gles2dbg", "rw");
frames.add(new Frame(currentContext, file.getFilePointer()));
} catch (FileNotFoundException e) {
e.printStackTrace();
assert false;
} catch (IOException e) {
e.printStackTrace();
assert false;
}
lastFrame = frames.get(0);
loadedFrame = lastFrame;
}
/**
* 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) {
Message msg = newMsg;
currentContext.processMessage(newMsg);
if (msg.hasDataType() && msg.getDataType() == DataType.ReferencedImage) {
final byte[] referenced = MessageProcessor.lzfDecompressChunks(msg.getData());
currentContext.readPixelRef = MessageProcessor.decodeReferencedImage(
currentContext.readPixelRef, referenced);
final byte[] decoded = MessageProcessor.lzfCompressChunks(
currentContext.readPixelRef, referenced.length);
msg = newMsg.toBuilder().setDataType(DataType.NonreferencedImage)
.setData(ByteString.copyFrom(decoded)).build();
}
/** write message to file; if frame not null, then increase its call count */
void saveMessage(final Message msg, final RandomAccessFile file, Frame frame) {
synchronized (file) {
lastFrame.increaseCallsCount();
if (frame != null)
frame.increaseCallsCount();
final byte[] data = msg.toByteArray();
final ByteBuffer len = ByteBuffer.allocate(4);
len.order(SampleView.targetByteOrder);
@@ -182,7 +163,65 @@ class DebugContext {
assert false;
}
}
}
/**
* 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) {
Message msg = newMsg;
if (msg.getFunction() == Function.SETPROP) {
// GL impl. consts should have been sent before any GL call messages
assert frames.size() == 0;
assert lastFrame == null;
assert msg.getProp() == Prop.GLConstant;
switch (GLEnum.valueOf(msg.getArg0())) {
case GL_MAX_VERTEX_ATTRIBS:
currentContext.serverVertex = new GLServerVertex(msg.getArg1());
break;
case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
currentContext.serverTexture = new GLServerTexture(currentContext,
msg.getArg1());
break;
default:
assert false;
return;
}
saveMessage(msg, file, null);
return;
}
if (lastFrame == null) {
// first real message after the GL impl. consts
synchronized (file) {
try {
lastFrame = new Frame(currentContext, file.getFilePointer());
} catch (IOException e) {
e.printStackTrace();
assert false;
}
}
synchronized (frames) {
frames.add(lastFrame);
}
assert loadedFrame == null;
loadedFrame = lastFrame;
}
currentContext.processMessage(msg);
if (msg.hasDataType() && msg.getDataType() == DataType.ReferencedImage) {
// decode referenced image so it doesn't rely on context later on
final byte[] referenced = MessageProcessor.lzfDecompressChunks(msg.getData());
currentContext.readPixelRef = MessageProcessor.decodeReferencedImage(
currentContext.readPixelRef, referenced);
final byte[] decoded = MessageProcessor.lzfCompressChunks(
currentContext.readPixelRef, referenced.length);
msg = msg.toBuilder().setDataType(DataType.NonreferencedImage)
.setData(ByteString.copyFrom(decoded)).build();
}
saveMessage(msg, file, lastFrame);
if (loadedFrame == lastFrame) {
// frame selected for view, so format MessageData
final MessageData msgData = new MessageData(Display.getCurrent(), msg, currentContext);
lastFrame.add(msgData);
uiUpdate = true;
@@ -230,10 +269,10 @@ class DebugContext {
public class Context implements Cloneable {
public final int contextId;
public ArrayList<Context> shares = new ArrayList<Context>(); // self too
public GLServerVertex serverVertex = new GLServerVertex();
public GLServerVertex serverVertex;
public GLServerShader serverShader = new GLServerShader(this);
public GLServerState serverState = new GLServerState(this);
public GLServerTexture serverTexture = new GLServerTexture(this);
public GLServerTexture serverTexture;
byte[] readPixelRef = new byte[0];
@@ -249,9 +288,11 @@ public class Context implements Cloneable {
// FIXME: context sharing list clone
copy.shares = new ArrayList<Context>(1);
copy.shares.add(copy);
if (serverVertex != null)
copy.serverVertex = serverVertex.clone();
copy.serverShader = serverShader.clone(copy);
copy.serverState = serverState.clone();
if (serverTexture != null)
copy.serverTexture = serverTexture.clone(copy);
// don't need to clone readPixelsRef, since referenced images
// are decoded when they are encountered

2
tools/glesv2debugger/src/com/android/glesv2debugger/DebuggerMessage.java
View File

@@ -532,6 +532,7 @@ public final class DebuggerMessage {
TimeMode(1, 1),
ExpectResponse(2, 2),
CaptureSwap(3, 3),
GLConstant(4, 4),
;
@@ -543,6 +544,7 @@ public final class DebuggerMessage {
case 1: return TimeMode;
case 2: return ExpectResponse;
case 3: return CaptureSwap;
case 4: return GLConstant;
default: return null;
}
}

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

@@ -83,14 +83,16 @@ public class GLServerTexture implements Cloneable {
Context context;
public GLEnum activeTexture = GLEnum.GL_TEXTURE0;
public int[] tmu2D = new int[16]; // TODO: MAX_COMBINED_TEXTURE_IMAGE_UNITS
public int[] tmuCube = new int[16];
public int[] tmu2D;
public int[] tmuCube;
public SparseArray<GLTexture> textures = new SparseArray<GLTexture>();
public GLTexture tex2D = null, texCube = null;
GLServerTexture(final Context context) {
GLServerTexture(final Context context, final int MAX_COMBINED_TEXTURE_IMAGE_UNITS) {
this.context = context;
textures.append(0, null);
tmu2D = new int[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
tmuCube = new int[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
}
public GLServerTexture clone(final Context copyContext) {

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

@@ -89,13 +89,12 @@ public class GLServerVertex implements Cloneable {
public GLAttribPointer attribPointers[];
public float defaultAttribs[][];
public GLServerVertex() {
public GLServerVertex(final int MAX_VERTEX_ATTRIBS) {
buffers.append(0, null);
// TODO: get MAX_VERTEX_ATTRIBS from server
attribPointers = new GLAttribPointer[16];
attribPointers = new GLAttribPointer[MAX_VERTEX_ATTRIBS];
for (int i = 0; i < attribPointers.length; i++)
attribPointers[i] = new GLAttribPointer();
defaultAttribs = new float[16][4];
defaultAttribs = new float[MAX_VERTEX_ATTRIBS][4];
for (int i = 0; i < defaultAttribs.length; i++) {
defaultAttribs[i][0] = 0;
defaultAttribs[i][1] = 0;

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

@@ -237,6 +237,10 @@ public class MessageQueue implements Runnable {
synchronized (complete) {
complete.add(msg);
}
} else if (msg.getType() == Type.Response && msg.getFunction() == Function.SETPROP) {
synchronized (complete) {
complete.add(msg);
}
} else
assert false;
}

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

@@ -741,7 +741,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
break;
if (newMessages > 60 || (newMessages > 0 && null == oriMsg)) {
newMessages = 0;
if (current == null || current.uiUpdate)
if (current != null && current.uiUpdate)
getSite().getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
@@ -783,7 +783,7 @@ public class SampleView extends ViewPart implements Runnable, SelectionListener
debugContext.processMessage(oriMsg);
shaderEditorUpdate |= debugContext.currentContext.serverShader.uiUpdate;
debugContext.currentContext.serverShader.uiUpdate = false;
if (current == null)
if (current == null && debugContext.frameCount() > 0)
changeContext(debugContext);
newMessages++;
}