| Index: src/gpu/effects/GrBezierEffect.cpp
|
| diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
|
| index febf18fbd2919b201b547b66fa6d5dc5c3d692d7..d57861d29ac55919a1dcd38f3fc7bf00e8158267 100644
|
| --- a/src/gpu/effects/GrBezierEffect.cpp
|
| +++ b/src/gpu/effects/GrBezierEffect.cpp
|
| @@ -7,11 +7,11 @@
|
|
|
| #include "GrBezierEffect.h"
|
|
|
| -#include "gl/GrGLFragmentProcessor.h"
|
| #include "gl/GrGLGeometryProcessor.h"
|
| -#include "gl/GrGLUtil.h"
|
| +#include "glsl/GrGLSLFragmentProcessor.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
| +#include "glsl/GrGLSLUtil.h"
|
|
|
| class GrGLConicEffect : public GrGLGeometryProcessor {
|
| public:
|
| @@ -30,7 +30,7 @@ public:
|
| if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) {
|
| fViewMatrix = ce.viewMatrix();
|
| float viewMatrix[3 * 3];
|
| - GrGLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| + GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
|
| }
|
|
|
| @@ -246,7 +246,7 @@ public:
|
| if (!qe.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(qe.viewMatrix())) {
|
| fViewMatrix = qe.viewMatrix();
|
| float viewMatrix[3 * 3];
|
| - GrGLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| + GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
|
| }
|
|
|
| @@ -448,7 +448,7 @@ public:
|
| if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) {
|
| fViewMatrix = ce.viewMatrix();
|
| float viewMatrix[3 * 3];
|
| - GrGLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| + GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
|
| pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
|
| }
|
|
|
|
|