Merge "For the serialization context, no fifo initialization is necessary." (e173b9d7) · Commits · e / os / android_frameworks_base

libs/rs/rsContext.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -340,10 +340,6 @@ Context::Context() {
		Context * Context::createContext(Device dev, const RsSurfaceConfig sc) {
		Context * rsc = new Context();

		// Temporary to avoid breaking the tools
		if (!dev) {
		return rsc;
		}
		if (!rsc->initContext(dev, sc)) {
		delete rsc;
		return NULL;

+4 −2

Original line number	Diff line number	Diff line
		@@ -21,15 +21,17 @@
		using namespace android;
		using namespace android::renderscript;

		LocklessCommandFifo::LocklessCommandFifo() {
		LocklessCommandFifo::LocklessCommandFifo() : mBuffer(0) {
		}

		LocklessCommandFifo::~LocklessCommandFifo() {
		if (!mInShutdown) {
		shutdown();
		}
		if (mBuffer) {
		free(mBuffer);
		}
		}

		void LocklessCommandFifo::shutdown() {
		mInShutdown = true;

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,7 @@
		using namespace android;
		using namespace android::renderscript;

		ThreadIO::ThreadIO() {
		mToCore.init(16 * 1024);
		ThreadIO::ThreadIO() : mUsingSocket(false) {
		}

		ThreadIO::~ThreadIO() {
		@@ -30,6 +29,7 @@ ThreadIO::~ThreadIO() {

		void ThreadIO::init(bool useSocket) {
		mUsingSocket = useSocket;
		mToCore.init(16 * 1024);

		if (mUsingSocket) {
		mToClientSocket.init();