Merge "Optimize FBOs composition" (8c8c2400) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Canvas.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -40,14 +40,8 @@ public class Canvas {
		// assigned in constructors, freed in finalizer
		final int mNativeCanvas;

		/* Our native canvas can be either a raster, gl, or picture canvas.
		If we are raster, then mGL will be null, and mBitmap may or may not be
		present (our default constructor creates a raster canvas but no
		java-bitmap is). If we are a gl-based, then mBitmap will be null, and
		mGL will not be null. Thus both cannot be non-null, but its possible
		for both to be null.
		*/
		private Bitmap mBitmap; // if not null, mGL must be null
		// may be null
		private Bitmap mBitmap;

		// optional field set by the caller
		private DrawFilter mDrawFilter;

+3 −5

Original line number	Diff line number	Diff line
		@@ -631,6 +631,9 @@ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) {
		const bool fboLayer = current->flags & Snapshot::kFlagIsFboLayer;

		if (fboLayer) {
		// Detach the texture from the FBO
		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);

		// Unbind current FBO and restore previous one
		glBindFramebuffer(GL_FRAMEBUFFER, previous->fbo);
		}
		@@ -671,11 +674,6 @@ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) {
		// code path
		// See LayerRenderer::destroyLayer(Layer*)

		// Detach the texture from the FBO
		glBindFramebuffer(GL_FRAMEBUFFER, current->fbo);
		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
		glBindFramebuffer(GL_FRAMEBUFFER, previous->fbo);

		// Put the FBO name back in the cache, if it doesn't fit, it will be destroyed
		mCaches.fboCache.put(current->fbo);
		layer->setFbo(0);