diff options
| author | Chris Craik <ccraik@google.com> | 2015-01-26 18:06:29 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-01-27 17:12:39 -0800 |
| commit | 65fe5eeb19e2e15c8b1ee91e8a2dcf0c25e48ca6 (patch) | |
| tree | 2283afa7268a8c9c488eb533066881e2b24d73a5 /libs/hwui/DisplayListOp.h | |
| parent | d05d91358d89953a1374601a5b04b7ed65403e8c (diff) | |
| download | frameworks_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/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 36c14c4..d128ffe 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -17,13 +17,6 @@ #ifndef ANDROID_HWUI_DISPLAY_OPERATION_H #define ANDROID_HWUI_DISPLAY_OPERATION_H -#include <SkColor.h> -#include <SkPath.h> -#include <SkPathOps.h> -#include <SkXfermode.h> - -#include <private/hwui/DrawGlInfo.h> - #include "OpenGLRenderer.h" #include "AssetAtlas.h" #include "DeferredDisplayList.h" @@ -31,11 +24,18 @@ #include "GammaFontRenderer.h" #include "Patch.h" #include "RenderNode.h" -#include "RenderState.h" +#include "renderstate/RenderState.h" #include "UvMapper.h" #include "utils/LinearAllocator.h" #include "utils/PaintUtils.h" +#include <SkColor.h> +#include <SkPath.h> +#include <SkPathOps.h> +#include <SkXfermode.h> + +#include <private/hwui/DrawGlInfo.h> + // Use OP_LOG for logging with arglist, OP_LOGS if just printing char* #define OP_LOGS(s) OP_LOG("%s", (s)) #define OP_LOG(s, ...) ALOGD( "%*s" s, level * 2, "", __VA_ARGS__ ) |