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

Commit 206904b2 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 468a9715: Merge "Remove unused param." 

* commit '468a9715':
  Remove unused param.
parents 146e4768 468a9715

libs/rs/rsContext.cpp

+3 −3
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void * Context::threadProc(void *vrsc) { 
    rsc->mRunning = true;

    if (!rsc->mIsGraphicsContext) {

        while (!rsc->mExit) {

            rsc->mIO.playCoreCommands(rsc, true, -1);

            rsc->mIO.playCoreCommands(rsc, -1);

        }

    } else {

#ifndef ANDROID_RS_SERIALIZE
@@ -268,14 +268,14 @@ void * Context::threadProc(void *vrsc) { 
                vsyncRate = targetRate;

            }

            if (targetRate) {

                drawOnce |= rsc->mIO.playCoreCommands(rsc, true, displayEvent.getFd());

                drawOnce |= rsc->mIO.playCoreCommands(rsc, displayEvent.getFd());

                while (displayEvent.getEvents(eventBuffer, 1) != 0) {

                    //ALOGE("vs2 time past %lld", (rsc->getTime() - eventBuffer[0].header.timestamp) / 1000000);

                }

            } else

#endif

            {

                drawOnce |= rsc->mIO.playCoreCommands(rsc, true, -1);

                drawOnce |= rsc->mIO.playCoreCommands(rsc, -1);

            }



            if ((rsc->mRootScript.get() != NULL) && rsc->mHasSurface &&

libs/rs/rsThreadIO.cpp

+1 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void ThreadIO::setTimeoutCallback(void (*cb)(void *), void *dat, uint64_t timeou 
    //mToCore.setTimeoutCallback(cb, dat, timeout);

}



bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) {

bool ThreadIO::playCoreCommands(Context *con, int waitFd) {

    bool ret = false;



    uint8_t buf[2 * 1024];
@@ -132,7 +132,6 @@ bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) { 
            if (con->props.mLogTimes) {

                con->timerSet(Context::RS_TIMER_INTERNAL);

            }

            waitForCommand = false;

            //ALOGV("playCoreCommands 3 %i %i", cmd->cmdID, cmd->bytes);



            if (cmd->cmdID >= (sizeof(gPlaybackFuncs) / sizeof(void *))) {

libs/rs/rsThreadIO.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public: 


    // Plays back commands from the client.

    // Returns true if any commands were processed.

    bool playCoreCommands(Context *con, bool waitForCommand, int waitFd);

    bool playCoreCommands(Context *con, int waitFd);



    void setTimeoutCallback(void (*)(void *), void *, uint64_t timeout);