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

Commit 963b0cdb authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of cbf26fd3 to master 

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
parents aa8da3dc cbf26fd3

libs/rs/rsProgram.cpp

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ bool Program::loadShader(Context *rsc, uint32_t type) 


    if (rsc->props.mLogShaders) {

        LOGV("Loading shader type %x, ID %i", type, mShaderID);

        LOGV(mShader.string());

        LOGV("%s", mShader.string());

    }



    if (mShaderID) {