Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22550a19 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Remove excessive logging, fix error in GLSL uniform generation."

parents 52952b1b e17e365b

libs/rs/rsProgram.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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;

    }

libs/rs/rsProgramVertex.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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 {