diff options
| author | Tim Murray <timmurray@google.com> | 2020-02-24 21:30:20 +0000 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2020-03-05 12:15:40 -0800 |
| commit | 894f132ba056b9d85598068e77d9050ad8963624 (patch) | |
| tree | 82f07c3e8422b4e3ba43c8107b86f7465c6c56f9 /libs/hwui/renderthread | |
| parent | 78afcedf9fefcd651802183f7844d3660e3e67df (diff) | |
Revert "hwui: remove FatVector"
Revert "libui: rewrite Region with FatVector"
Revert submission 10248126-fatvector-region
Reason for revert: b/149254345
Reverted Changes:
I09dc2fddd:hwui: remove FatVector
I265c6c831:libui: rewrite Region with FatVector
also fix wrong license in FatVector.h
Test: boots
Bug: 149254345
Change-Id: I8ac66acb8b635324051edd41c5d4092c223157ff
Diffstat (limited to 'libs/hwui/renderthread')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 3 | ||||
| -rw-r--r-- | libs/hwui/renderthread/VulkanManager.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 206b58f62ea7..cae3e3b5188c 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -27,6 +27,7 @@ #include "pipeline/skia/SkiaOpenGLPipeline.h" #include "pipeline/skia/SkiaVulkanPipeline.h" #include "renderstate/RenderState.h" +#include "utils/FatVector.h" #include "utils/TimeUtils.h" #include "utils/TraceUtils.h" @@ -39,8 +40,6 @@ #include <utils/Mutex.h> #include <thread> -#include <ui/FatVector.h> - namespace android { namespace uirenderer { namespace renderthread { diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index ba70afc8b8d2..a5355fc3499d 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -23,13 +23,13 @@ #include <GrContext.h> #include <GrTypes.h> #include <android/sync.h> -#include <ui/FatVector.h> #include <vk/GrVkExtensions.h> #include <vk/GrVkTypes.h> #include "Properties.h" #include "RenderThread.h" #include "renderstate/RenderState.h" +#include "utils/FatVector.h" #include "utils/TraceUtils.h" namespace android { |