Support readback of TextureView into 565 and extended sRGB. am: 2324991a77 (ecbb3144) · Commits · e / os / android_frameworks_base

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+33 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,8 @@
	#include "utils/TraceUtils.h"		#include "utils/TraceUtils.h"

	#include <GrBackendSurface.h>		#include <GrBackendSurface.h>
			#include <SkImageInfo.h>
			#include <SkBlendMode.h>

	#include <cutils/properties.h>		#include <cutils/properties.h>
	#include <strings.h>		#include <strings.h>
	@@ -136,20 +138,49 @@ bool SkiaOpenGLPipeline::copyLayerInto(DeferredLayerUpdater* deferredLayer, SkBi
	deferredLayer->updateTexImage();		deferredLayer->updateTexImage();
	deferredLayer->apply();		deferredLayer->apply();

			// drop the colorSpace as we only support readback into sRGB or extended sRGB
			SkImageInfo surfaceInfo = bitmap->info().makeColorSpace(nullptr);

	/* This intermediate surface is present to work around a bug in SwiftShader that		/* This intermediate surface is present to work around a bug in SwiftShader that
	* prevents us from reading the contents of the layer's texture directly. The		* prevents us from reading the contents of the layer's texture directly. The
	* workaround involves first rendering that texture into an intermediate buffer and		* workaround involves first rendering that texture into an intermediate buffer and
	* then reading from the intermediate buffer into the bitmap.		* then reading from the intermediate buffer into the bitmap.
	*/		*/
	sk_sp<SkSurface> tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),		sk_sp<SkSurface> tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),
	SkBudgeted::kYes, bitmap->info());		SkBudgeted::kYes, surfaceInfo);

			if (!tmpSurface.get()) {
			surfaceInfo = surfaceInfo.makeColorType(SkColorType::kN32_SkColorType);
			tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),
			SkBudgeted::kYes, surfaceInfo);
			if (!tmpSurface.get()) {
			ALOGW("Unable to readback GPU contents into the provided bitmap");
			return false;
			}
			}

	Layer* layer = deferredLayer->backingLayer();		Layer* layer = deferredLayer->backingLayer();
	const SkRect dstRect = SkRect::MakeIWH(bitmap->width(), bitmap->height());		const SkRect dstRect = SkRect::MakeIWH(bitmap->width(), bitmap->height());
	if (LayerDrawable::DrawLayer(mRenderThread.getGrContext(), tmpSurface->getCanvas(), layer,		if (LayerDrawable::DrawLayer(mRenderThread.getGrContext(), tmpSurface->getCanvas(), layer,
	&dstRect)) {		&dstRect)) {
	sk_sp<SkImage> tmpImage = tmpSurface->makeImageSnapshot();		sk_sp<SkImage> tmpImage = tmpSurface->makeImageSnapshot();
	if (tmpImage->readPixels(bitmap->info(), bitmap->getPixels(), bitmap->rowBytes(), 0, 0)) {		if (tmpImage->readPixels(surfaceInfo, bitmap->getPixels(), bitmap->rowBytes(), 0, 0)) {
			bitmap->notifyPixelsChanged();
			return true;
			}

			// if we fail to readback from the GPU directly (e.g. 565) then we attempt to read into 8888
			// and then draw that into the destination format before giving up.
			SkBitmap tmpBitmap;
			SkImageInfo bitmapInfo = SkImageInfo::MakeN32(bitmap->width(), bitmap->height(),
			bitmap->alphaType());
			if (tmpBitmap.tryAllocPixels(bitmapInfo) &&
			tmpImage->readPixels(bitmapInfo, tmpBitmap.getPixels(),
			tmpBitmap.rowBytes(), 0, 0)) {
			SkCanvas canvas(*bitmap);
			SkPaint paint;
			paint.setBlendMode(SkBlendMode::kSrc);
			canvas.drawBitmap(tmpBitmap, 0, 0, &paint);
	bitmap->notifyPixelsChanged();		bitmap->notifyPixelsChanged();
	return true;		return true;
	}		}