commit 2145390fbef13b8b9d9b52b47d031c3be7dc0b43
author Robert Phillips <robertphillips@google.com> Fri Aug 27 16:05:04 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Aug 30 14:14:14 2021 +0000
tree 8893160197e9fe1a0c87c3a72130f913728b0d7e
parent 91b781e7f670afedac062678f1bea59dfffe7042

Move GrTextureOp to skgpu::v1 namespace

Bug: skia:11837
Change-Id: Ie99b1c512885404351d6917bbea751d99a2ca23e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442797
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/BulkRectTest.cpp

diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp
index 7a8c035..8fabae1 100644
--- a/tests/BulkRectTest.cpp
+++ b/tests/BulkRectTest.cpp
@@ -12,7 +12,7 @@
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/ops/GrFillRectOp.h"
-#include "src/gpu/ops/GrTextureOp.h"
+#include "src/gpu/ops/TextureOp.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 #include "tests/Test.h"
 
@@ -147,35 +147,35 @@
             quad.fLocal = GrQuad(set[i].fSrcRect);
             quad.fEdgeFlags = set[i].fAAFlags;
 
-            GrOp::Owner op = GrTextureOp::Make(dContext,
-                                               set[i].fProxyView,
-                                               set[i].fSrcAlphaType,
-                                               nullptr,
-                                               GrSamplerState::Filter::kNearest,
-                                               GrSamplerState::MipmapMode::kNone,
-                                               set[i].fColor,
-                                               GrTextureOp::Saturate::kYes,
-                                               blendMode,
-                                               overallAA,
-                                               &quad,
-                                               nullptr);
+            GrOp::Owner op = skgpu::v1::TextureOp::Make(dContext,
+                                                        set[i].fProxyView,
+                                                        set[i].fSrcAlphaType,
+                                                        nullptr,
+                                                        GrSamplerState::Filter::kNearest,
+                                                        GrSamplerState::MipmapMode::kNone,
+                                                        set[i].fColor,
+                                                        skgpu::v1::TextureOp::Saturate::kYes,
+                                                        blendMode,
+                                                        overallAA,
+                                                        &quad,
+                                                        nullptr);
             sdc->addDrawOp(nullptr, std::move(op));
         }
     } else {
-        GrTextureOp::AddTextureSetOps(sdc.get(),
-                                      nullptr,
-                                      dContext,
-                                      set,
-                                      requestedTotNumQuads,
-                                      requestedTotNumQuads,  // We alternate so proxyCnt == cnt
-                                      GrSamplerState::Filter::kNearest,
-                                      GrSamplerState::MipmapMode::kNone,
-                                      GrTextureOp::Saturate::kYes,
-                                      blendMode,
-                                      overallAA,
-                                      SkCanvas::kStrict_SrcRectConstraint,
-                                      SkMatrix::I(),
-                                      nullptr);
+        skgpu::v1::TextureOp::AddTextureSetOps(sdc.get(),
+                                               nullptr,
+                                               dContext,
+                                               set,
+                                               requestedTotNumQuads,
+                                               requestedTotNumQuads,  // We alternate so proxyCnt == cnt
+                                               GrSamplerState::Filter::kNearest,
+                                               GrSamplerState::MipmapMode::kNone,
+                                               skgpu::v1::TextureOp::Saturate::kYes,
+                                               blendMode,
+                                               overallAA,
+                                               SkCanvas::kStrict_SrcRectConstraint,
+                                               SkMatrix::I(),
+                                               nullptr);
     }
 
     auto opsTask = sdc->testingOnly_PeekLastOpsTask();
@@ -190,7 +190,7 @@
         // from being merged back into fewer ops.
         expectedNumOps = requestedTotNumQuads;
     }
-    uint32_t expectedOpID = blendMode == SkBlendMode::kSrcOver ? GrTextureOp::ClassID()
+    uint32_t expectedOpID = blendMode == SkBlendMode::kSrcOver ? skgpu::v1::TextureOp::ClassID()
                                                                : GrFillRectOp::ClassID();
     for (int i = 0; i < actualNumOps; ++i) {
         const GrOp* tmp = opsTask->getChain(i);