commit d2743ea50c43ff4cadbc3fc634449d3ab1685701
author Brian Salomon <bsalomon@google.com> Tue Feb 21 16:54:27 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 22 15:44:43 2017 +0000
tree f3dd26feeddee9039502684e7d63bbc287824ba4
parent 8a0bfc5201f14c994fe8062ecf1ca34a172de9d3

Remove GrPipelineBuilder.cpp

Change-Id: I14c26f2967e4722fa4d6ce4664a5857add0cf854
Reviewed-on: https://skia-review.googlesource.com/8822
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

gn/gpu.gni

diff --git a/gn/gpu.gni b/gn/gpu.gni
index 11ac1cf..ae05f2c 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -136,7 +136,6 @@
   "$_src/gpu/GrPendingProgramElement.h",
   "$_src/gpu/GrPipeline.cpp",
   "$_src/gpu/GrPipeline.h",
-  "$_src/gpu/GrPipelineBuilder.cpp",
   "$_src/gpu/GrPipelineBuilder.h",
   "$_src/gpu/GrPipelineInput.h",
   "$_src/gpu/GrPrimitiveProcessor.cpp",

src/gpu/GrPipelineBuilder.cpp

diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
deleted file mode 100644
index d249d58..0000000
--- a/src/gpu/GrPipelineBuilder.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrPipelineBuilder.h"
-
-#include "GrBlend.h"
-#include "GrPaint.h"
-#include "GrPipeline.h"
-#include "GrProcOptInfo.h"
-#include "GrXferProcessor.h"
-#include "effects/GrPorterDuffXferProcessor.h"
-#include "ops/GrOp.h"
-
-GrPipelineBuilder::GrPipelineBuilder(GrPaint&& paint, GrAAType aaType)
-        : fFlags(0x0)
-        , fDrawFace(GrDrawFace::kBoth)
-        , fUserStencilSettings(&GrUserStencilSettings::kUnused)
-        , fProcessors(std::move(paint)) {
-    if (GrAATypeIsHW(aaType)) {
-        fFlags |= GrPipeline::kHWAntialias_Flag;
-    }
-}
-
-bool GrPipelineBuilder::willXPNeedDstTexture(const GrCaps& caps,
-                                             const GrPipelineAnalysis& analysis) const {
-    if (fProcessors.xpFactory()) {
-        return fProcessors.xpFactory()->willNeedDstTexture(caps, analysis);
-    }
-    return GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(caps, analysis);
-}

src/gpu/GrPipelineBuilder.h

diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h
index aca1925..4e4861a 100644
--- a/src/gpu/GrPipelineBuilder.h
+++ b/src/gpu/GrPipelineBuilder.h
@@ -29,7 +29,15 @@
      * no GrPaint equivalents are set to default values with the exception of vertex attribute state
      * which is unmodified by this function and clipping which will be enabled.
      */
-    GrPipelineBuilder(GrPaint&&, GrAAType);
+    GrPipelineBuilder(GrPaint&& paint, GrAAType aaType)
+            : fFlags(0x0)
+            , fDrawFace(GrDrawFace::kBoth)
+            , fUserStencilSettings(&GrUserStencilSettings::kUnused)
+            , fProcessors(std::move(paint)) {
+        if (GrAATypeIsHW(aaType)) {
+            fFlags |= GrPipeline::kHWAntialias_Flag;
+        }
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Fragment Processors
@@ -67,7 +75,12 @@
     /**
      * Checks whether the xp will need destination in a texture to correctly blend.
      */
-    bool willXPNeedDstTexture(const GrCaps& caps, const GrPipelineAnalysis&) const;
+    bool willXPNeedDstTexture(const GrCaps& caps, const GrPipelineAnalysis& analysis) const {
+        if (fProcessors.xpFactory()) {
+            return fProcessors.xpFactory()->willNeedDstTexture(caps, analysis);
+        }
+        return GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(caps, analysis);
+    }
 
     /// @}