From 5d2cd207905bf9a5c143124ecd03b78be182e8f5 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 16 Jan 2013 15:31:06 +0000 Subject: [PATCH] Fix GPU-less build. git-svn-id: http://skia.googlecode.com/svn/trunk@7224 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/gradients/SkLinearGradient.cpp | 2 +- src/effects/gradients/SkRadialGradient.cpp | 2 +- src/effects/gradients/SkSweepGradient.cpp | 2 +- src/effects/gradients/SkTwoPointConicalGradient.cpp | 2 +- src/effects/gradients/SkTwoPointRadialGradient.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 2785806..8daa5ca 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -566,7 +566,7 @@ GrEffectRef* SkLinearGradient::asNewEffect(GrContext* context, const SkPaint&) c #else -GrEffect* SkLinearGradient::asNewEffect(GrContext* context, const SkPaint&) const { +GrEffectRef* SkLinearGradient::asNewEffect(GrContext*, const SkPaint&) const { SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; } diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 4609db1..dea1322 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -589,7 +589,7 @@ GrEffectRef* SkRadialGradient::asNewEffect(GrContext* context, const SkPaint&) c #else -GrEffect* SkRadialGradient::asNewEffect(GrContext* context, const SkPaint&) const { +GrEffectRef* SkRadialGradient::asNewEffect(GrContext*, const SkPaint&) const { SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; } diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 91e239c..810c9de 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -488,7 +488,7 @@ GrEffectRef* SkSweepGradient::asNewEffect(GrContext* context, const SkPaint&) co #else -GrEffect* SkSweepGradient::asNewEffect(GrContext* context, const SkPaint&) const { +GrEffectRef* SkSweepGradient::asNewEffect(GrContext*, const SkPaint&) const { SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; } diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 8d03c13..1552149 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -717,7 +717,7 @@ GrEffectRef* SkTwoPointConicalGradient::asNewEffect(GrContext* context, const Sk #else -GrEffect* SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint&) const { +GrEffectRef* SkTwoPointConicalGradient::asNewEffect(GrContext*, const SkPaint&) const { SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; } diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 8380a3f..bfc067f 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -714,7 +714,7 @@ GrEffectRef* SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkP #else -GrEffect* SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkPaint&) const { +GrEffectRef* SkTwoPointRadialGradient::asNewEffect(GrContext*, const SkPaint&) const { SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; } -- 2.7.4