summaryrefslogtreecommitdiffstats
path: root/libs/hwui/Layer.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-01-26 18:06:29 -0800
committerChris Craik <ccraik@google.com>2015-01-27 17:12:39 -0800
commit65fe5eeb19e2e15c8b1ee91e8a2dcf0c25e48ca6 (patch)
tree2283afa7268a8c9c488eb533066881e2b24d73a5 /libs/hwui/Layer.cpp
parentd05d91358d89953a1374601a5b04b7ed65403e8c (diff)
downloadframeworks_base-65fe5eeb19e2e15c8b1ee91e8a2dcf0c25e48ca6.zip
frameworks_base-65fe5eeb19e2e15c8b1ee91e8a2dcf0c25e48ca6.tar.gz
frameworks_base-65fe5eeb19e2e15c8b1ee91e8a2dcf0c25e48ca6.tar.bz2
Move scissor state to RenderState
Change-Id: I1227a3886fb24e4d9fad79fca469794f06cfb15e
Diffstat (limited to 'libs/hwui/Layer.cpp')
-rw-r--r--libs/hwui/Layer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 7388e3c..ee6154f 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -16,17 +16,18 @@
#define LOG_TAG "OpenGLRenderer"
-#include <utils/Log.h>
+#include "Layer.h"
#include "Caches.h"
#include "DeferredDisplayList.h"
-#include "Layer.h"
#include "LayerRenderer.h"
#include "OpenGLRenderer.h"
#include "RenderNode.h"
-#include "RenderState.h"
+#include "renderstate/RenderState.h"
#include "utils/TraceUtils.h"
+#include <utils/Log.h>
+
#define ATRACE_LAYER_WORK(label) \
ATRACE_FORMAT("%s HW Layer DisplayList %s %ux%u", \
label, \