diff options
author | egdaniel <egdaniel@google.com> | 2015-10-28 07:26:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-28 07:26:40 -0700 |
commit | 018fb62d12d1febf121fe265da5b6117b86a6541 (patch) | |
tree | 61d845716f03c05ea86aab539fcc5035b5f30734 /src/gpu/GrDefaultGeoProcFactory.cpp | |
parent | fe6876280f6d79deb6a3f9d5a75f90a937e9026f (diff) |
Create GLSL base class for ProgramDataManager
BUG=skia:
Review URL: https://codereview.chromium.org/1428543003
Diffstat (limited to 'src/gpu/GrDefaultGeoProcFactory.cpp')
-rw-r--r-- | src/gpu/GrDefaultGeoProcFactory.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index 2f7d14ac7e..23530acaed 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -131,18 +131,19 @@ public: b->add32(key); } - void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override { + void setData(const GrGLSLProgramDataManager& pdman, + const GrPrimitiveProcessor& gp) override { const DefaultGeoProc& dgp = gp.cast<DefaultGeoProc>(); if (!dgp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dgp.viewMatrix())) { fViewMatrix = dgp.viewMatrix(); - GrGLfloat viewMatrix[3 * 3]; + float viewMatrix[3 * 3]; GrGLGetMatrix<3>(viewMatrix, fViewMatrix); pdman.setMatrix3f(fViewMatrixUniform, viewMatrix); } if (dgp.color() != fColor && !dgp.hasVertexColor()) { - GrGLfloat c[4]; + float c[4]; GrColorToRGBAFloat(dgp.color(), c); pdman.set4fv(fColorUniform, 1, c); fColor = dgp.color(); @@ -156,7 +157,7 @@ public: } void setTransformData(const GrPrimitiveProcessor& primProc, - const GrGLProgramDataManager& pdman, + const GrGLSLProgramDataManager& pdman, int index, const SkTArray<const GrCoordTransform*, true>& transforms) override { this->setTransformDataHelper<DefaultGeoProc>(primProc, pdman, index, transforms); |