commit 895274391db8df7357334aec260edca2e1735626
author Brian Salomon <bsalomon@google.com> Fri Dec 16 09:52:16 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 16:58:24 2016 +0000
tree 6c447a64c6e376d67503ef18e20cfdb655b6a312
parent 6b316e9e20d67f0f13021ca62f4270105c6151b1

move src/gpu/batches -> src/gpu/ops

Change-Id: I6410eae41f051ce38bef6f38d670924c3483c325
Reviewed-on: https://skia-review.googlesource.com/6163
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

gm/beziereffects.cpp

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 61ad64a..e529ded 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -18,7 +18,7 @@
 #include "SkColorPriv.h"
 #include "SkGeometry.h"
 
-#include "batches/GrTestMeshDrawOp.h"
+#include "ops/GrTestMeshDrawOp.h"
 
 #include "effects/GrBezierEffect.h"
 

gm/bigrrectaaeffect.cpp

diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index 3b4ffe2..372858e 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -10,9 +10,9 @@
 #include "GrContext.h"
 #include "GrRenderTargetContextPriv.h"
 #include "SkRRect.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrRRectEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 

gm/constcolorprocessor.cpp

diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index 11883d2..0e3c56f 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -15,9 +15,9 @@
 #include "GrRenderTargetContextPriv.h"
 #include "SkGrPriv.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrConstColorProcessor.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 /**

gm/convexpolyeffect.cpp

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index f3b7294..d6decb9 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -20,8 +20,8 @@
 #include "SkGeometry.h"
 #include "SkTLList.h"
 
-#include "batches/GrMeshDrawOp.h"
-#include "batches/GrTestMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
+#include "ops/GrTestMeshDrawOp.h"
 
 #include "effects/GrConvexPolyEffect.h"
 

gm/rrects.cpp

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 0810f27..4649a68 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -9,9 +9,9 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrRenderTargetContextPriv.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrRRectEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 #endif
 #include "SkRRect.h"
 

gm/texturedomaineffect.cpp

diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 417d99a..cf7ec41 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -16,9 +16,9 @@
 #include "SkBitmap.h"
 #include "SkGr.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrTextureDomain.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 /**

gm/yuvtorgbeffect.cpp

diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index ac96303..32c20d2 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -16,9 +16,9 @@
 #include "SkBitmap.h"
 #include "SkGr.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrYUVEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 #define YSIZE 8
 #define USIZE 4