diff options
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r-- | src/gpu/glsl/GrGLSLVarying.cpp | 18 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLVarying.h | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/gpu/glsl/GrGLSLVarying.cpp b/src/gpu/glsl/GrGLSLVarying.cpp index f8ec1c24d9..0563406385 100644 --- a/src/gpu/glsl/GrGLSLVarying.cpp +++ b/src/gpu/glsl/GrGLSLVarying.cpp @@ -9,14 +9,15 @@ #include "glsl/GrGLSLVarying.h" #include "glsl/GrGLSLProgramBuilder.h" -void GrGLSLVaryingHandler::addPassThroughAttribute(const GrGeometryProcessor::Attribute* input, +void GrGLSLVaryingHandler::addPassThroughAttribute(const GrGeometryProcessor::Attribute& input, const char* output, Interpolation interpolation) { + SkASSERT(input.isInitialized()); SkASSERT(!fProgramBuilder->primitiveProcessor().willUseGeoShader()); - GrSLType type = GrVertexAttribTypeToSLType(input->type()); + GrSLType type = GrVertexAttribTypeToSLType(input.type()); GrGLSLVarying v(type); - this->addVarying(input->name(), &v, interpolation); - fProgramBuilder->fVS.codeAppendf("%s = %s;", v.vsOut(), input->name()); + this->addVarying(input.name(), &v, interpolation); + fProgramBuilder->fVS.codeAppendf("%s = %s;", v.vsOut(), input.name()); fProgramBuilder->fFS.codeAppendf("%s = %s;", output, v.fsIn()); } @@ -67,10 +68,13 @@ void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying, } void GrGLSLVaryingHandler::emitAttributes(const GrGeometryProcessor& gp) { - int vaCount = gp.numAttribs(); + int vaCount = gp.numVertexAttributes(); for (int i = 0; i < vaCount; i++) { - const GrGeometryProcessor::Attribute& attr = gp.getAttrib(i); - this->addAttribute(attr.asShaderVar()); + this->addAttribute(gp.vertexAttribute(i).asShaderVar()); + } + int iaCount = gp.numInstanceAttributes(); + for (int i = 0; i < iaCount; i++) { + this->addAttribute(gp.instanceAttribute(i).asShaderVar()); } } diff --git a/src/gpu/glsl/GrGLSLVarying.h b/src/gpu/glsl/GrGLSLVarying.h index 57704ad075..0da88a0fbd 100644 --- a/src/gpu/glsl/GrGLSLVarying.h +++ b/src/gpu/glsl/GrGLSLVarying.h @@ -104,7 +104,7 @@ public: * that will be set as the output varying for all emitted vertices. * TODO it might be nicer behavior to have a flag to declare output inside these calls */ - void addPassThroughAttribute(const GrGeometryProcessor::Attribute*, const char* output, + void addPassThroughAttribute(const GrGeometryProcessor::Attribute&, const char* output, Interpolation = Interpolation::kInterpolated); void emitAttributes(const GrGeometryProcessor& gp); |