Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused param."

Browse Source
This commit is contained in:
Jason Sams
2012-02-09 15:17:27 -08:00
committed by Android (Google) Code Review
parent 8f0f10a80a 87e2721f89
commit 468a971512
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/rs/rsContext.cpp
View File

@@ -248,7 +248,7 @@ void * Context::threadProc(void *vrsc) {
rsc->mRunning = true; rsc->mRunning = true;
if (!rsc->mIsGraphicsContext) { if (!rsc->mIsGraphicsContext) {
while (!rsc->mExit) { while (!rsc->mExit) {
rsc->mIO.playCoreCommands(rsc, true, -1); rsc->mIO.playCoreCommands(rsc, -1);
} }
} else { } else {
#ifndef ANDROID_RS_SERIALIZE #ifndef ANDROID_RS_SERIALIZE
@@ -268,14 +268,14 @@ void * Context::threadProc(void *vrsc) {
vsyncRate = targetRate; vsyncRate = targetRate;
} }
if (targetRate) { if (targetRate) {
drawOnce |= rsc->mIO.playCoreCommands(rsc, true, displayEvent.getFd()); drawOnce |= rsc->mIO.playCoreCommands(rsc, displayEvent.getFd());
while (displayEvent.getEvents(eventBuffer, 1) != 0) { while (displayEvent.getEvents(eventBuffer, 1) != 0) {
//ALOGE("vs2 time past %lld", (rsc->getTime() - eventBuffer[0].header.timestamp) / 1000000); //ALOGE("vs2 time past %lld", (rsc->getTime() - eventBuffer[0].header.timestamp) / 1000000);
} }
} else } else
#endif #endif
{ {
drawOnce |= rsc->mIO.playCoreCommands(rsc, true, -1); drawOnce |= rsc->mIO.playCoreCommands(rsc, -1);
} }
if ((rsc->mRootScript.get() != NULL) && rsc->mHasSurface && if ((rsc->mRootScript.get() != NULL) && rsc->mHasSurface &&

3
libs/rs/rsThreadIO.cpp
View File

@@ -89,7 +89,7 @@ void ThreadIO::setTimeoutCallback(void (*cb)(void *), void *dat, uint64_t timeou
//mToCore.setTimeoutCallback(cb, dat, timeout); //mToCore.setTimeoutCallback(cb, dat, timeout);
} }
bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) { bool ThreadIO::playCoreCommands(Context *con, int waitFd) {
bool ret = false; bool ret = false;
uint8_t buf[2 * 1024]; uint8_t buf[2 * 1024];
@@ -132,7 +132,6 @@ bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand, int waitFd) {
if (con->props.mLogTimes) { if (con->props.mLogTimes) {
con->timerSet(Context::RS_TIMER_INTERNAL); con->timerSet(Context::RS_TIMER_INTERNAL);
} }
waitForCommand = false;
//ALOGV("playCoreCommands 3 %i %i", cmd->cmdID, cmd->bytes); //ALOGV("playCoreCommands 3 %i %i", cmd->cmdID, cmd->bytes);
if (cmd->cmdID >= (sizeof(gPlaybackFuncs) / sizeof(void *))) { if (cmd->cmdID >= (sizeof(gPlaybackFuncs) / sizeof(void *))) {

2
libs/rs/rsThreadIO.h
View File

@@ -36,7 +36,7 @@ public:
// Plays back commands from the client. // Plays back commands from the client.
// Returns true if any commands were processed. // 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); void setTimeoutCallback(void (*)(void *), void *, uint64_t timeout);