diff options
| author | Jason Sams <rjsams@android.com> | 2010-01-13 14:54:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-13 14:54:20 -0800 |
| commit | 22550a19431919915a1cb454fcc1ffa5d5b6eb5c (patch) | |
| tree | 1a008703aea95e5c5ba45c1eae986b169042bbb1 /libs/rs | |
| parent | 52952b1bcab28f655775efbad8f2e2b41d06a34b (diff) | |
| parent | e17e365b71030ff2d839c63ac6e5d044b4b15773 (diff) | |
| download | frameworks_base-22550a19431919915a1cb454fcc1ffa5d5b6eb5c.zip frameworks_base-22550a19431919915a1cb454fcc1ffa5d5b6eb5c.tar.gz frameworks_base-22550a19431919915a1cb454fcc1ffa5d5b6eb5c.tar.bz2 | |
Merge "Remove excessive logging, fix error in GLSL uniform generation."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsProgram.cpp | 1 | ||||
| -rw-r--r-- | libs/rs/rsProgramVertex.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index b528c46..656a3c3 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -110,7 +110,6 @@ Program::~Program() void Program::bindAllocation(Allocation *alloc, uint32_t slot) { - LOGE("bind alloc %p %i", alloc, slot); if (mConstants[slot].get() == alloc) { return; } diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp index 8849bda..cf6d7fc 100644 --- a/libs/rs/rsProgramVertex.cpp +++ b/libs/rs/rsProgramVertex.cpp @@ -124,7 +124,6 @@ void ProgramVertex::createShader() mShader.append(mUniformNames[0]); mShader.append(";\n"); - LOGE("constant %i ", mConstantCount); for (uint32_t ct=0; ct < mConstantCount; ct++) { const Element *e = mConstantTypes[ct]->getElement(); for (uint32_t field=0; field < e->getFieldCount(); field++) { @@ -337,7 +336,7 @@ void ProgramVertex::init(Context *rsc) mUniformCount = 1; mUniformNames[0].setTo("UNI_MVP"); - for (uint32_t ct=0; ct < mInputCount; ct++) { + for (uint32_t ct=0; ct < mConstantCount; ct++) { initAddUserElement(mConstantTypes[ct]->getElement(), mUniformNames, &mUniformCount, "UNI_"); } } else { |