From 867c43de0544217d26c3ee18f4d6603bb2ea97ce Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 30 Aug 2018 16:47:59 +0000
Subject: Revert "TextureView Vulkan support and optimized OpenGL draw"

This reverts commit c8e22a653297837da9a80b0ba65f6854c8986c96.

Reason for revert: broke camera, b/113555199

Bug: 113555199
Change-Id: Iae9b462694d5de0cd99427afead63b567fb4d71d
---
 libs/hwui/Layer.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libs/hwui/Layer.cpp')

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index f59a2e6ee5c1..fb8f0337c95e 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -17,17 +17,17 @@
 #include "Layer.h"
 
 #include "renderstate/RenderState.h"
-#include "utils/Color.h"
 
 #include <SkToSRGBColorFilter.h>
 
 namespace android {
 namespace uirenderer {
 
-Layer::Layer(RenderState& renderState, sk_sp<SkColorFilter> colorFilter, int alpha,
-        SkBlendMode mode)
+Layer::Layer(RenderState& renderState, Api api, sk_sp<SkColorFilter> colorFilter, int alpha,
+             SkBlendMode mode)
         : GpuMemoryTracker(GpuObjectType::Layer)
         , mRenderState(renderState)
+        , mApi(api)
         , mColorFilter(colorFilter)
         , alpha(alpha)
         , mode(mode) {
@@ -36,8 +36,6 @@ Layer::Layer(RenderState& renderState, sk_sp<SkColorFilter> colorFilter, int alp
     incStrong(nullptr);
     buildColorSpaceWithFilter();
     renderState.registerLayer(this);
-    texTransform.setIdentity();
-    transform.setIdentity();
 }
 
 Layer::~Layer() {
-- 
cgit v1.2.3-59-g8ed1b