summaryrefslogtreecommitdiff
path: root/libs/hwui/SkiaShader.cpp
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-11-21 21:38:42 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-21 21:38:42 +0000
commit99377df12ee696e01cd9071132f122801a9862ce (patch)
tree01769a67c494fe1f8264581d4f01e94705ce9c5f /libs/hwui/SkiaShader.cpp
parente606a7884dff4acc926cb82bf6492e83e9a1d3af (diff)
parentd2738eadc1f8c92c64d47429ef3f168738431809 (diff)
am d2738ead: Merge "Frameworks/base: Unused parameters in hwui"
* commit 'd2738eadc1f8c92c64d47429ef3f168738431809': Frameworks/base: Unused parameters in hwui
Diffstat (limited to 'libs/hwui/SkiaShader.cpp')
-rw-r--r--libs/hwui/SkiaShader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp
index c672bc433ca0..76a70c2200a1 100644
--- a/libs/hwui/SkiaShader.cpp
+++ b/libs/hwui/SkiaShader.cpp
@@ -163,7 +163,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;
}
@@ -339,7 +339,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;