| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index d22b4628bb54c314e2368d9d46d975838d0df0ec..66e934a6f9329028f93740bca2c4f8d366306cae 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -126,7 +126,7 @@ public:
|
|
|
| static void GenKey(const GrGeometryProcessor& gp,
|
| const GrBatchTracker& bt,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const BatchTracker& local = bt.cast<BatchTracker>();
|
| const CircleEdgeEffect& circleEffect = gp.cast<CircleEdgeEffect>();
|
| @@ -157,13 +157,13 @@ public:
|
| };
|
|
|
| virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const override {
|
| GLProcessor::GenKey(*this, bt, caps, b);
|
| }
|
|
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const override {
|
| + const GrGLSLCaps&) const override {
|
| return SkNEW_ARGS(GLProcessor, (*this, bt));
|
| }
|
|
|
| @@ -320,7 +320,7 @@ public:
|
|
|
| static void GenKey(const GrGeometryProcessor& gp,
|
| const GrBatchTracker& bt,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const BatchTracker& local = bt.cast<BatchTracker>();
|
| const EllipseEdgeEffect& ellipseEffect = gp.cast<EllipseEdgeEffect>();
|
| @@ -352,13 +352,13 @@ public:
|
| };
|
|
|
| virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const override {
|
| GLProcessor::GenKey(*this, bt, caps, b);
|
| }
|
|
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const override {
|
| + const GrGLSLCaps&) const override {
|
| return SkNEW_ARGS(GLProcessor, (*this, bt));
|
| }
|
|
|
| @@ -535,7 +535,7 @@ public:
|
|
|
| static void GenKey(const GrGeometryProcessor& gp,
|
| const GrBatchTracker& bt,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const BatchTracker& local = bt.cast<BatchTracker>();
|
| const DIEllipseEdgeEffect& ellipseEffect = gp.cast<DIEllipseEdgeEffect>();
|
| @@ -567,13 +567,13 @@ public:
|
| };
|
|
|
| virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const override {
|
| GLProcessor::GenKey(*this, bt, caps, b);
|
| }
|
|
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const override {
|
| + const GrGLSLCaps&) const override {
|
| return SkNEW_ARGS(GLProcessor, (*this, bt));
|
| }
|
|
|
|
|