Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.
Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef*
Make GrEffectRef a typedef for GrEffect.
Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/377503004
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 64c8559..8ead5b8 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -172,7 +172,7 @@
*this->caps(),
dummyTextures));
SkASSERT(effect);
- int numAttribs = (*effect)->numVertexAttribs();
+ int numAttribs = effect->numVertexAttribs();
// If adding this effect would exceed the max attrib count then generate a
// new random effect.
@@ -183,15 +183,15 @@
// If adding this effect would exceed the max texture coord set count then generate a
// new random effect.
- if (useFixedFunctionTexturing && !(*effect)->hasVertexCode()) {
- int numTransforms = (*effect)->numTransforms();
+ if (useFixedFunctionTexturing && !effect->hasVertexCode()) {
+ int numTransforms = effect->numTransforms();
if (currTextureCoordSet + numTransforms > this->glCaps().maxFixedFunctionTextureCoords()) {
continue;
}
currTextureCoordSet += numTransforms;
}
- useFixedFunctionTexturing = useFixedFunctionTexturing && !(*effect)->hasVertexCode();
+ useFixedFunctionTexturing = useFixedFunctionTexturing && !effect->hasVertexCode();
for (int i = 0; i < numAttribs; ++i) {
attribIndices[i] = currAttribIndex++;