Merge "[HWUI] Update Ganesh includes to specify new location" into main (d1e52c5b) · Commits · e / os / android_frameworks_base

libs/hwui/AutoBackendTextureRelease.cpp

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,11 +17,12 @@
	#include "AutoBackendTextureRelease.h"		#include "AutoBackendTextureRelease.h"

	#include <SkImage.h>		#include <SkImage.h>
	#include <include/gpu/ganesh/SkImageGanesh.h>
	#include <include/gpu/GrDirectContext.h>
	#include <include/gpu/GrBackendSurface.h>
	#include <include/gpu/MutableTextureState.h>		#include <include/gpu/MutableTextureState.h>
			#include <include/gpu/ganesh/GrBackendSurface.h>
			#include <include/gpu/ganesh/GrDirectContext.h>
			#include <include/gpu/ganesh/SkImageGanesh.h>
	#include <include/gpu/vk/VulkanMutableTextureState.h>		#include <include/gpu/vk/VulkanMutableTextureState.h>

	#include "renderthread/RenderThread.h"		#include "renderthread/RenderThread.h"
	#include "utils/Color.h"		#include "utils/Color.h"
	#include "utils/PaintUtils.h"		#include "utils/PaintUtils.h"

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,10 +16,10 @@

	#pragma once		#pragma once

	#include <GrAHardwareBufferUtils.h>
	#include <GrBackendSurface.h>
	#include <SkImage.h>		#include <SkImage.h>
	#include <android/hardware_buffer.h>		#include <android/hardware_buffer.h>
			#include <include/android/GrAHardwareBufferUtils.h>
			#include <include/gpu/ganesh/GrBackendSurface.h>
	#include <system/graphics.h>		#include <system/graphics.h>

	namespace android {		namespace android {

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,6 @@
	#include <GLES2/gl2.h>		#include <GLES2/gl2.h>
	#include <GLES2/gl2ext.h>		#include <GLES2/gl2ext.h>
	#include <GLES3/gl3.h>		#include <GLES3/gl3.h>
	#include <GrDirectContext.h>
	#include <GrTypes.h>
	#include <SkBitmap.h>		#include <SkBitmap.h>
	#include <SkCanvas.h>		#include <SkCanvas.h>
	#include <SkImage.h>		#include <SkImage.h>
	@@ -30,6 +28,8 @@
	#include <SkImageInfo.h>		#include <SkImageInfo.h>
	#include <SkRefCnt.h>		#include <SkRefCnt.h>
	#include <gui/TraceUtils.h>		#include <gui/TraceUtils.h>
			#include <include/gpu/ganesh/GrDirectContext.h>
			#include <include/gpu/ganesh/GrTypes.h>
	#include <utils/GLUtils.h>		#include <utils/GLUtils.h>
	#include <utils/NdkUtils.h>		#include <utils/NdkUtils.h>
	#include <utils/Trace.h>		#include <utils/Trace.h>

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,8 @@
	#ifndef MESH_H_		#ifndef MESH_H_
	#define MESH_H_		#define MESH_H_

	#include <GrDirectContext.h>
	#include <SkMesh.h>		#include <SkMesh.h>
			#include <include/gpu/ganesh/GrDirectContext.h>
	#include <include/gpu/ganesh/SkMeshGanesh.h>		#include <include/gpu/ganesh/SkMeshGanesh.h>
	#include <jni.h>		#include <jni.h>
	#include <log/log.h>		#include <log/log.h>

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,12 @@

	#include "RecordingCanvas.h"		#include "RecordingCanvas.h"

	#include <GrRecordingContext.h>
	#include <SkMesh.h>		#include <SkMesh.h>
	#include <hwui/Paint.h>		#include <hwui/Paint.h>
			#include <include/gpu/GpuTypes.h>
			#include <include/gpu/ganesh/GrDirectContext.h>
			#include <include/gpu/ganesh/GrRecordingContext.h>
			#include <include/gpu/ganesh/SkMeshGanesh.h>
	#include <log/log.h>		#include <log/log.h>

	#include <experimental/type_traits>		#include <experimental/type_traits>
	@@ -48,9 +51,6 @@
	#include "Tonemapper.h"		#include "Tonemapper.h"
	#include "VectorDrawable.h"		#include "VectorDrawable.h"
	#include "effects/GainmapRenderer.h"		#include "effects/GainmapRenderer.h"
	#include "include/gpu/GpuTypes.h" // from Skia
	#include "include/gpu/GrDirectContext.h"
	#include "include/gpu/ganesh/SkMeshGanesh.h"
	#include "pipeline/skia/AnimatedDrawables.h"		#include "pipeline/skia/AnimatedDrawables.h"
	#include "pipeline/skia/FunctorDrawable.h"		#include "pipeline/skia/FunctorDrawable.h"
	#ifdef __ANDROID__		#ifdef __ANDROID__