am 468a9715: Merge "Remove unused param."

* commit '468a971512f4665b13e83cc3c7dc24c9031b14eb':
  Remove unused param.

3 files changed, 5 insertions, 6 deletions

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 3346594..adaefc6 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -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 &&
diff --git a/libs/rs/rsThreadIO.cpp b/libs/rs/rsThreadIO.cpp
index 8e4b988..4f30573 100644
--- a/libs/rs/rsThreadIO.cpp
+++ b/libs/rs/rsThreadIO.cpp
@@ -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 *))) {
diff --git a/libs/rs/rsThreadIO.h b/libs/rs/rsThreadIO.h
index d56a1c9..62e3e33 100644
--- a/libs/rs/rsThreadIO.h
+++ b/libs/rs/rsThreadIO.h
@@ -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);