diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-10 12:13:36 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-10 12:13:36 +0000 |
| commit | d8f856c32b679d9f5a9926feac005e2c0186f83f (patch) | |
| tree | 9a5c91574e05899e7a6abe3df5ce591acf898d9b /include/gpu/GrSamplerState.h | |
| parent | 96a162eb71a9613ebadf8689128a6b2f50fe8f0d (diff) | |
Move convolution from code in GrGLProgram to new GrConvolutionEffect
class. This is the first test of the new Ganesh shader pipeline.
Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing
us to remove ../ from many #include directives.
http://codereview.appspot.com/6199053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrSamplerState.h')
| -rw-r--r-- | include/gpu/GrSamplerState.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h index 3fd39c560a..a48150262a 100644 --- a/include/gpu/GrSamplerState.h +++ b/include/gpu/GrSamplerState.h @@ -133,9 +133,9 @@ public: return !memcmp(this, &s, bitwiseRegion) && ((fCustomStage == s.fCustomStage) || (fCustomStage && s.fCustomStage && - (fCustomStage->getGLFactory() == - s.fCustomStage->getGLFactory()) && - fCustomStage->isEquivalent(s.fCustomStage))); + (fCustomStage->getFactory() == + s.fCustomStage->getFactory()) && + fCustomStage->isEqual(s.fCustomStage))); } bool operator !=(const GrSamplerState& s) const { return !(*this == s); } @@ -289,10 +289,6 @@ private: uint8_t fKernelWidth; float fKernel[MAX_KERNEL_WIDTH]; - /// BUG! Ganesh only works correctly so long as fCustomStage is - /// NULL; we need to have a complex ID system here so that we can - /// have an equality-like comparison to determine whether two - /// fCustomStages are equal. GrCustomStage* fCustomStage; }; |