aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-04 14:38:48 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-04 14:38:48 +0000
commite6e62d1de9ab6cd7ad098a5e953bf207047389e8 (patch)
treefafb308b00b99adb1f6adc83c92578c1622441b2 /include
parent73d5b2f620c02f0741c9ce13091f108855f066ae (diff)
Make numTextures() be non-virtual on GrCustomStage.
R=tomhudson@google.com,robertphillips@google.com,senorblanco@chromium.org Review URL: https://codereview.appspot.com/6586081 git-svn-id: http://skia.googlecode.com/svn/trunk@5805 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/gpu/GrCustomStage.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/gpu/GrCustomStage.h b/include/gpu/GrCustomStage.h
index 9765a42f2b..d75675c6c1 100644
--- a/include/gpu/GrCustomStage.h
+++ b/include/gpu/GrCustomStage.h
@@ -35,7 +35,7 @@ public:
typedef GrProgramStageFactory::StageKey StageKey;
- GrCustomStage();
+ explicit GrCustomStage(int numTextures);
virtual ~GrCustomStage();
/** If given an input texture that is/is not opaque, is this
@@ -81,7 +81,7 @@ public:
in generated shader code. */
const char* name() const { return this->getFactory().name(); }
- virtual int numTextures() const;
+ int numTextures() const { return fNumTextures; }
/** Returns the access pattern for the texture at index. index must be valid according to
numTextures(). */
@@ -94,6 +94,7 @@ public:
void operator delete(void* target);
private:
+ int fNumTextures;
typedef GrRefCnt INHERITED;
};