Skip to content

Commit 468a971

Browse files
Jason SamsAndroid (Google) Code Review
authored andcommitted
Merge "Remove unused param."
2 parents 8f0f10a + 87e2721 commit 468a971

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

libs/rs/rsContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void * Context::threadProc(void *vrsc) {
248248
rsc->mRunning = true;
249249
if (!rsc->mIsGraphicsContext) {
250250
while (!rsc->mExit) {
251-
rsc->mIO.playCoreCommands(rsc, true, -1);
251+
rsc->mIO.playCoreCommands(rsc, -1);
252252
}
253253
} else {
254254
#ifndef ANDROID_RS_SERIALIZE
@@ -268,14 +268,14 @@ void * Context::threadProc(void *vrsc) {
268268
vsyncRate = targetRate;
269269
}
270270
if (targetRate) {
271-
drawOnce |= rsc->mIO.playCoreCommands(rsc, true, displayEvent.getFd());
271+
drawOnce |= rsc->mIO.playCoreCommands(rsc, displayEvent.getFd());
272272
while (displayEvent.getEvents(eventBuffer, 1) != 0) {
273273
//ALOGE("vs2 time past %lld", (rsc->getTime() - eventBuffer[0].header.timestamp) / 1000000);
274274
}
275275
} else
276276
#endif
277277
{
278-
drawOnce |= rsc->mIO.playCoreCommands(rsc, true, -1);
278+
drawOnce |= rsc->mIO.playCoreCommands(rsc, -1);
279279
}
280280

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

libs/rs/rsThreadIO.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void ThreadIO::setTimeoutCallback(void (*cb)(void *), void *dat, uint64_t timeou
8989
//mToCore.setTimeoutCallback(cb, dat, timeout);
9090
}
9191

92-
bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) {
92+
bool ThreadIO::playCoreCommands(Context *con, int waitFd) {
9393
bool ret = false;
9494

9595
uint8_t buf[2 * 1024];
@@ -132,7 +132,6 @@ bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) {
132132
if (con->props.mLogTimes) {
133133
con->timerSet(Context::RS_TIMER_INTERNAL);
134134
}
135-
waitForCommand = false;
136135
//ALOGV("playCoreCommands 3 %i %i", cmd->cmdID, cmd->bytes);
137136

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

libs/rs/rsThreadIO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ThreadIO {
3636

3737
// Plays back commands from the client.
3838
// Returns true if any commands were processed.
39-
bool playCoreCommands(Context *con, bool waitForCommand, int waitFd);
39+
bool playCoreCommands(Context *con, int waitFd);
4040

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

0 commit comments

Comments
 (0)