diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /libs/hwui/SkiaShader.cpp | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb (diff) | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf (diff) | |
| download | frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.zip frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.gz frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.bz2 | |
resolved conflicts for merge of 220c3f4f to master
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
Diffstat (limited to 'libs/hwui/SkiaShader.cpp')
| -rw-r--r-- | libs/hwui/SkiaShader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp index dff19a9..0f7c1d4 100644 --- a/libs/hwui/SkiaShader.cpp +++ b/libs/hwui/SkiaShader.cpp @@ -164,7 +164,7 @@ void SkiaShader::setupProgram(Caches* caches, const mat4& modelViewMatrix, /////////////////////////////////////////////////////////////////////////////// void SkiaLayerShader::describe(Caches*, ProgramDescription& description, - const Extensions&, const SkShader& shader) { + const Extensions&, const SkShader& /* shader */) { description.hasBitmap = true; } @@ -340,7 +340,7 @@ static bool isSimpleGradient(const SkShader::GradientInfo& gradInfo) { } void SkiaGradientShader::describe(Caches*, ProgramDescription& description, - const Extensions& extensions, const SkShader& shader) { + const Extensions& /* extensions */, const SkShader& shader) { SkShader::GradientInfo gradInfo; gradInfo.fColorCount = 0; gradInfo.fColors = NULL; |