Merge "SF: build with ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION" (b438a9f8) · Commits · e / os / platform_frameworks_native

libs/gui/include/gui/BLASTBufferQueue.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ private:

		// Queues up transactions using this token in SurfaceFlinger. This prevents queued up
		// transactions from other parts of the client from blocking this transaction.
		const sp<IBinder> mApplyToken GUARDED_BY(mMutex) = new BBinder();
		const sp<IBinder> mApplyToken GUARDED_BY(mMutex) = sp<BBinder>::make();

		// Guards access to mDequeueTimestamps since we cannot hold to mMutex in onFrameDequeued or
		// we will deadlock.

libs/gui/include/gui/LayerState.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ struct layer_state_t {
		mat4 colorTransform;
		std::vector<BlurRegion> blurRegions;

		sp<gui::WindowInfoHandle> windowInfoHandle = new gui::WindowInfoHandle();
		sp<gui::WindowInfoHandle> windowInfoHandle = sp<gui::WindowInfoHandle>::make();

		LayerMetadata metadata;

libs/renderengine/benchmark/RenderEngineBench.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -117,7 +117,8 @@ static std::shared_ptr<ExternalTexture> allocateBuffer(RenderEngine& re, uint32_
		uint64_t extraUsageFlags = 0,
		std::string name = "output") {
		return std::make_shared<
		impl::ExternalTexture>(new GraphicBuffer(width, height, HAL_PIXEL_FORMAT_RGBA_8888, 1,
		impl::ExternalTexture>(sp<GraphicBuffer>::make(width, height,
		HAL_PIXEL_FORMAT_RGBA_8888, 1u,
		GRALLOC_USAGE_HW_RENDER \|
		GRALLOC_USAGE_HW_TEXTURE \|
		extraUsageFlags,

libs/renderengine/gl/GLESRenderEngine.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -454,8 +454,9 @@ GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisp
		mImageManager->initThread();
		mDrawingBuffer = createFramebuffer();
		sp<GraphicBuffer> buf =
		new GraphicBuffer(1, 1, PIXEL_FORMAT_RGBA_8888, 1,
		GRALLOC_USAGE_HW_RENDER \| GRALLOC_USAGE_HW_TEXTURE, "placeholder");
		sp<GraphicBuffer>::make(1, 1, PIXEL_FORMAT_RGBA_8888, 1,
		GRALLOC_USAGE_HW_RENDER \| GRALLOC_USAGE_HW_TEXTURE,
		"placeholder");

		const status_t err = buf->initCheck();
		if (err != OK) {

libs/renderengine/skia/Cache.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -364,8 +364,8 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine) {
		const int64_t usage = GRALLOC_USAGE_HW_RENDER \| GRALLOC_USAGE_HW_TEXTURE;

		sp<GraphicBuffer> dstBuffer =
		new GraphicBuffer(displayRect.width(), displayRect.height(), PIXEL_FORMAT_RGBA_8888,
		1, usage, "primeShaderCache_dst");
		sp<GraphicBuffer>::make(displayRect.width(), displayRect.height(),
		PIXEL_FORMAT_RGBA_8888, 1, usage, "primeShaderCache_dst");

		const auto dstTexture =
		std::make_shared<impl::ExternalTexture>(dstBuffer, *renderengine,
		@@ -375,8 +375,8 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine) {
		// something, but the details are not important. Make use of the shadow layer drawing step
		// to populate it.
		sp<GraphicBuffer> srcBuffer =
		new GraphicBuffer(displayRect.width(), displayRect.height(), PIXEL_FORMAT_RGBA_8888,
		1, usage, "drawImageLayer_src");
		sp<GraphicBuffer>::make(displayRect.width(), displayRect.height(),
		PIXEL_FORMAT_RGBA_8888, 1, usage, "drawImageLayer_src");

		const auto srcTexture = std::make_shared<
		impl::ExternalTexture>(srcBuffer, *renderengine,
		@@ -398,8 +398,9 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine) {
		// GRALLOC_USAGE_HW_TEXTURE should be the same as AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE.
		const int64_t usageExternal = GRALLOC_USAGE_HW_TEXTURE;
		sp<GraphicBuffer> externalBuffer =
		new GraphicBuffer(displayRect.width(), displayRect.height(), PIXEL_FORMAT_RGBA_8888,
		1, usageExternal, "primeShaderCache_external");
		sp<GraphicBuffer>::make(displayRect.width(), displayRect.height(),
		PIXEL_FORMAT_RGBA_8888, 1, usageExternal,
		"primeShaderCache_external");
		const auto externalTexture =
		std::make_shared<impl::ExternalTexture>(externalBuffer, *renderengine,
		impl::ExternalTexture::Usage::READABLE);
		@@ -409,8 +410,9 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine) {
		// Another external texture with a different pixel format triggers useIsOpaqueWorkaround.
		// It doesn't have to be f16, but it can't be the usual 8888.
		sp<GraphicBuffer> f16ExternalBuffer =
		new GraphicBuffer(displayRect.width(), displayRect.height(), PIXEL_FORMAT_RGBA_FP16,
		1, usageExternal, "primeShaderCache_external_f16");
		sp<GraphicBuffer>::make(displayRect.width(), displayRect.height(),
		PIXEL_FORMAT_RGBA_FP16, 1, usageExternal,
		"primeShaderCache_external_f16");
		// The F16 texture may not be usable on all devices, so check first that it was created.
		status_t error = f16ExternalBuffer->initCheck();
		if (!error) {