diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-08-14 18:53:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-08-14 18:53:00 +0000 |
| commit | 5131332bbb775729c337a4b6fc2ce87099b9177e (patch) | |
| tree | 9de350f72bba5961d619d3459a098264616796ed /eclipse | |
| parent | 1af9ef83f5f6c6fd9202d5bdd8d4248a4eb855aa (diff) | |
| parent | 4d05f33f9ac64d5570e0ae841bcb33101a8f1ba3 (diff) | |
| download | replicant_sdk-5131332bbb775729c337a4b6fc2ce87099b9177e.zip replicant_sdk-5131332bbb775729c337a4b6fc2ce87099b9177e.tar.gz replicant_sdk-5131332bbb775729c337a4b6fc2ce87099b9177e.tar.bz2 | |
Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133
automerge: 4d05f33
* commit '4d05f33f9ac64d5570e0ae841bcb33101a8f1ba3':
gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java index 6230586..04ce676 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/state/GLState.java @@ -23,10 +23,10 @@ import java.util.Collections; public class GLState { /** # of texture units modeled in the GL State. */ - public static final int TEXTURE_UNIT_COUNT = 16; + public static final int TEXTURE_UNIT_COUNT = 32; /** # of vertex attributes */ - private static final int MAX_VERTEX_ATTRIBS = 8; + private static final int MAX_VERTEX_ATTRIBS = 16; private static GLState sGLState = new GLState(); |