Merge "Remove erroneous log message." into honeycomb (88c2d705) · Commits · e / os / android_frameworks_base

libs/rs/rsScriptC.cpp

+72 −79

Original line number	Diff line number	Diff line
		@@ -471,7 +471,6 @@ void ScriptCState::runCompiler(Context *rsc,
		ScriptC *s,
		const char *resName,
		const char *cacheDir) {
		{
		s->mBccScript = bccCreateScript();

		s->mEnviroment.mIsThreadable = true;
		@@ -508,8 +507,6 @@ void ScriptCState::runCompiler(Context *rsc,

		s->mProgram.mRoot = reinterpret_cast<int (*)()>(bccGetFuncAddr(s->mBccScript, "root"));
		s->mProgram.mInit = reinterpret_cast<void (*)()>(bccGetFuncAddr(s->mBccScript, "init"));
		}
		LOGV("%p ScriptCState::runCompiler root %p, init %p", rsc, s->mProgram.mRoot, s->mProgram.mInit);

		if (s->mProgram.mInit) {
		s->mProgram.mInit();
		@@ -537,7 +534,6 @@ void ScriptCState::runCompiler(Context *rsc,
		s->mEnviroment.mFragmentStore.set(rsc->getDefaultProgramStore());
		s->mEnviroment.mRaster.set(rsc->getDefaultProgramRaster());

		if (s->mProgram.mRoot) {
		const static int pragmaMax = 16;
		size_t pragmaCount = bccGetPragmaCount(s->mBccScript);
		char const *keys[pragmaMax];
		@@ -547,6 +543,7 @@ void ScriptCState::runCompiler(Context *rsc,
		for (size_t i=0; i < pragmaCount; ++i) {
		//LOGE("pragma %s %s", keys[i], values[i]);
		if (!strcmp(keys[i], "version")) {
		// TODO: Verify that version is correct
		continue;
		}

		@@ -594,10 +591,6 @@ void ScriptCState::runCompiler(Context *rsc,
		LOGE("Unreconized value %s passed to stateStore", values[i]);
		}
		}
		} else {
		LOGE("bcc: FAILS to prepare executable");
		// Handle Fatal Error
		}
		}

		namespace android {