diff options
author | joshualitt <joshualitt@chromium.org> | 2015-01-14 08:12:47 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 08:12:47 -0800 |
commit | 71c9260e6fa1798ad1e41b2c2ae9b3cce08bb610 (patch) | |
tree | 6dcf4f549ee113669d8becc37c83225fcba36ba5 /src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp | |
parent | 95145a9d3e0be24769c4c4e3810058e08b06fd3b (diff) |
More changes to bring together path / geo procs
BUG=skia:
Review URL: https://codereview.chromium.org/820783005
Diffstat (limited to 'src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp')
-rw-r--r-- | src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp index ead0edfaea..d67a476c68 100644 --- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp @@ -27,10 +27,9 @@ void GrGLVertexBuilder::addVarying(const char* name, GrGLVarying* v) { } void GrGLVertexBuilder::emitAttributes(const GrGeometryProcessor& gp) { - const GrGeometryProcessor::VertexAttribArray& v = gp.getAttribs(); - int vaCount = v.count(); + int vaCount = gp.numAttribs(); for (int i = 0; i < vaCount; i++) { - this->addAttribute(&v[i]); + this->addAttribute(&gp.getAttrib(i)); } return; } @@ -55,12 +54,11 @@ void GrGLVertexBuilder::transformToNormalizedDeviceSpace(const char* pos3) { } void GrGLVertexBuilder::bindVertexAttributes(GrGLuint programID) { - const GrGeometryProcessor* gp = fProgramBuilder->fOptState.getGeometryProcessor(); + const GrPrimitiveProcessor* primProc = fProgramBuilder->fOptState.getPrimitiveProcessor(); - const GrGeometryProcessor::VertexAttribArray& v = gp->getAttribs(); - int vaCount = v.count(); + int vaCount = primProc->numAttribs(); for (int i = 0; i < vaCount; i++) { - GL_CALL(BindAttribLocation(programID, i, v[i].fName)); + GL_CALL(BindAttribLocation(programID, i, primProc->getAttrib(i).fName)); } return; } |