Rename GrVertexBatch->GrMeshDrawOp
Change-Id: I3ebe5a471477ce1b71c150b0bde4982d113fd8a7
Reviewed-on: https://skia-review.googlesource.com/5468
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 4adccf9..735b92f 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -17,14 +17,14 @@
#include "GrStyle.h"
#include "SkRRect.h"
#include "SkStrokeRec.h"
-#include "batches/GrVertexBatch.h"
+#include "batches/GrMeshDrawOp.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLGeometryProcessor.h"
#include "glsl/GrGLSLProgramDataManager.h"
-#include "glsl/GrGLSLVarying.h"
-#include "glsl/GrGLSLVertexShaderBuilder.h"
#include "glsl/GrGLSLUniformHandler.h"
#include "glsl/GrGLSLUtil.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
// TODO(joshualitt) - Break this file up during GrOp post implementation cleanup
@@ -597,7 +597,7 @@
///////////////////////////////////////////////////////////////////////////////
-class CircleBatch : public GrVertexBatch {
+class CircleBatch : public GrMeshDrawOp {
public:
DEFINE_OP_CLASS_ID
@@ -1143,12 +1143,12 @@
bool fClipPlaneIsect;
bool fClipPlaneUnion;
- typedef GrVertexBatch INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
-class EllipseBatch : public GrVertexBatch {
+class EllipseBatch : public GrMeshDrawOp {
public:
DEFINE_OP_CLASS_ID
static GrDrawOp* Create(GrColor color, const SkMatrix& viewMatrix, const SkRect& ellipse,
@@ -1374,12 +1374,12 @@
SkMatrix fViewMatrixIfUsingLocalCoords;
SkSTArray<1, Geometry, true> fGeoData;
- typedef GrVertexBatch INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
/////////////////////////////////////////////////////////////////////////////////////////////////
-class DIEllipseBatch : public GrVertexBatch {
+class DIEllipseBatch : public GrMeshDrawOp {
public:
DEFINE_OP_CLASS_ID
@@ -1598,7 +1598,7 @@
bool fUsesLocalCoords;
SkSTArray<1, Geometry, true> fGeoData;
- typedef GrVertexBatch INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
@@ -1721,7 +1721,7 @@
// each vertex is also given the normalized x & y distance from the interior rect's edge
// the GP takes the min of those depths +1 to get the normalized distance to the outer edge
-class RRectCircleRendererBatch : public GrVertexBatch {
+class RRectCircleRendererBatch : public GrMeshDrawOp {
public:
DEFINE_OP_CLASS_ID
@@ -2055,7 +2055,7 @@
int fIndexCount;
bool fAllFill;
- typedef GrVertexBatch INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
static const int kNumRRectsInIndexBuffer = 256;
@@ -2081,7 +2081,7 @@
};
}
-class RRectEllipseRendererBatch : public GrVertexBatch {
+class RRectEllipseRendererBatch : public GrMeshDrawOp {
public:
DEFINE_OP_CLASS_ID
@@ -2309,7 +2309,7 @@
SkMatrix fViewMatrixIfUsingLocalCoords;
SkSTArray<1, Geometry, true> fGeoData;
- typedef GrVertexBatch INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
static GrDrawOp* create_rrect_batch(GrColor color,