diff options
| author | Chris Craik <ccraik@google.com> | 2015-02-02 18:39:33 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-02-04 15:57:59 -0800 |
| commit | 031888744e24b5c7243ac99ec98b78aff5db1c78 (patch) | |
| tree | ba2037e7d008a1d7dfbcfb4cb905ea7fe68ffaef /libs/hwui/OpenGLRenderer.cpp | |
| parent | 6c15ffa196fc9b7724c189d833c3435d8db12266 (diff) | |
| download | frameworks_base-031888744e24b5c7243ac99ec98b78aff5db1c78.zip frameworks_base-031888744e24b5c7243ac99ec98b78aff5db1c78.tar.gz frameworks_base-031888744e24b5c7243ac99ec98b78aff5db1c78.tar.bz2 | |
GlopBuilder, and test app refactor
Change-Id: I2cd299ccf178007fd5f83bab6c3448f03aec7843
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 ab6f0ce..b10aea3 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -20,10 +20,13 @@ #include "DisplayListRenderer.h" #include "Fence.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" @@ -101,7 +104,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() { @@ -1704,9 +1707,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); } |