Merge "tone down the log spew regarding taking screenshots." into honeycomb (c4ce4455) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+1 −18

Original line number	Diff line number	Diff line
		@@ -2170,8 +2170,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,

		GLenum status = glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);

		LOGD("screenshot: FBO created, status=0x%x", status);

		if (status == GL_FRAMEBUFFER_COMPLETE_OES) {

		// invert everything, b/c glReadPixel() below will invert the FB
		@@ -2187,8 +2185,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		glClearColor(0,0,0,1);
		glClear(GL_COLOR_BUFFER_BIT);

		LOGD("screenshot: glClear() issued");

		const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ);
		const size_t count = layers.size();
		for (size_t i=0 ; i<count ; ++i) {
		@@ -2199,8 +2195,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		}
		}

		LOGD("screenshot: All layers rendered");

		// XXX: this is needed on tegra
		glScissor(0, 0, sw, sh);

		@@ -2215,10 +2209,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		new MemoryHeapBase(size, 0, "screen-capture") );
		void* const ptr = base->getBase();
		if (ptr) {

		LOGD("screenshot: about to call glReadPixels(0,0,%d,%d,...,%p)",
		sw, sh, ptr);

		// capture the screen with glReadPixels()
		glReadPixels(0, 0, sw, sh, GL_RGBA, GL_UNSIGNED_BYTE, ptr);
		if (glGetError() == GL_NO_ERROR) {
		@@ -2231,9 +2221,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		} else {
		result = NO_MEMORY;
		}

		LOGD("screenshot: glReadPixels() returned %s", strerror(result));

		}
		glEnable(GL_SCISSOR_TEST);
		glViewport(0, 0, hw_w, hw_h);
		@@ -2244,18 +2231,14 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		result = BAD_VALUE;
		}

		LOGD("screenshot: about to release FBO resources");

		// release FBO resources
		glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
		glDeleteRenderbuffersOES(1, &tname);
		glDeleteFramebuffersOES(1, &name);

		LOGD("screenshot: about to call compositionComplete()");

		hw.compositionComplete();

		LOGD("screenshot: result = %s", strerror(result));
		LOGD("screenshot: result = %s", result<0 ? strerror(result) : "OK");

		return result;
		}