diff options
| author | Chris Craik <ccraik@google.com> | 2015-02-05 00:25:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 00:25:04 +0000 |
| commit | ecad24b49d20f7fb4b75950e9444787967acd347 (patch) | |
| tree | 74c55efb6736b3b142a299f2c1feae32abf06b7a /libs/hwui/OpenGLRenderer.cpp | |
| parent | e8d05b5bab49f2becb1762b70275d3914de23be2 (diff) | |
| parent | 031888744e24b5c7243ac99ec98b78aff5db1c78 (diff) | |
| download | frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.zip frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.tar.gz frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.tar.bz2 | |
Merge "GlopBuilder, and test app refactor"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index b56ce4f..f4b12b6 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -19,10 +19,13 @@ #include "DeferredDisplayList.h" #include "DisplayListRenderer.h" #include "GammaFontRenderer.h" +#include "Glop.h" +#include "GlopBuilder.h" #include "Patch.h" #include "PathTessellator.h" #include "Properties.h" #include "RenderNode.h" +#include "renderstate/MeshState.h" #include "renderstate/RenderState.h" #include "ShadowTessellator.h" #include "SkiaShader.h" @@ -100,7 +103,7 @@ OpenGLRenderer::OpenGLRenderer(RenderState& renderState) memset(&mDrawModifiers, 0, sizeof(mDrawModifiers)); mDrawModifiers.mOverrideLayerAlpha = 1.0f; - memcpy(mMeshVertices, kMeshVertices, sizeof(kMeshVertices)); + memcpy(mMeshVertices, kUnitQuadVertices, sizeof(kUnitQuadVertices)); } OpenGLRenderer::~OpenGLRenderer() { @@ -1703,9 +1706,9 @@ void OpenGLRenderer::setupDrawBlending(const SkPaint* paint, bool blend, bool sw // When the blending mode is kClear_Mode, we need to use a modulate color // argb=1,0,0,0 accountForClear(mode); - blend |= (mColorSet && mColorA < 1.0f) || - (getShader(paint) && !getShader(paint)->isOpaque()) || - PaintUtils::isBlendedColorFilter(getColorFilter(paint)); + blend |= (mColorSet && mColorA < 1.0f) + || (getShader(paint) && !getShader(paint)->isOpaque()) + || PaintUtils::isBlendedColorFilter(getColorFilter(paint)); chooseBlending(blend, mode, mDescription, swapSrcDst); } |