commit b11ab578ad6389d07bbc638966947d89dbe00a44
author Mike Klein <mtklein@google.com> Wed Oct 24 06:42:14 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 24 11:15:58 2018 +0000
tree 6730e347a1ae1c863f862c8238e0853443a39d24
parent 70bd0b72f3f837fcc663fb0728f3e69ba26bd93a

remove src/jumper

The distinction between SkJumper and SkRasterPipeline used
to be important, but it's no longer.  This CL moves everything
under src/jumper to the appropriate SkRasterPipeline file.

Change-Id: I1181fffafccb3dc4c4eb5f33b442c719ee370462
Reviewed-on: https://skia-review.googlesource.com/c/164627
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

tests/SkRasterPipelineTest.cpp

diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp
index 59f1910..4568c07 100644
--- a/tests/SkRasterPipelineTest.cpp
+++ b/tests/SkRasterPipelineTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "../src/jumper/SkJumper.h"
 #include "SkHalf.h"
 #include "SkRasterPipeline.h"
 #include "SkTo.h"
@@ -18,9 +17,9 @@
              blue = 0x3800380000000000ull,
              result;
 
-    SkJumper_MemoryCtx load_s_ctx = { &blue, 0 },
-                       load_d_ctx = { &red, 0 },
-                       store_ctx  = { &result, 0 };
+    SkRasterPipeline_MemoryCtx load_s_ctx = { &blue, 0 },
+                               load_d_ctx = { &red, 0 },
+                               store_ctx  = { &result, 0 };
 
     SkRasterPipeline_<256> p;
     p.append(SkRasterPipeline::load_f16,     &load_s_ctx);
@@ -62,7 +61,7 @@
          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     };
 
-    SkJumper_MemoryCtx src = { buf +  0, 0 },
+    SkRasterPipeline_MemoryCtx src = { buf +  0, 0 },
                        dst = { buf + 36, 0 };
 
     // Copy buf[x] to buf[x+36] for x in [15,35).
@@ -105,7 +104,7 @@
 
         float buffer[4][4];
 
-        SkJumper_MemoryCtx src = { &data[0][0], 0 },
+        SkRasterPipeline_MemoryCtx src = { &data[0][0], 0 },
                            dst = { &buffer[0][0], 0 };
 
         for (unsigned i = 1; i <= 4; i++) {
@@ -137,7 +136,7 @@
             {h(30), h(31), h(32), h(33)},
         };
         alignas(8) uint16_t buffer[4][4];
-        SkJumper_MemoryCtx src = { &data[0][0], 0 },
+        SkRasterPipeline_MemoryCtx src = { &data[0][0], 0 },
                            dst = { &buffer[0][0], 0 };
 
         for (unsigned i = 1; i <= 4; i++) {
@@ -168,7 +167,7 @@
                 | (4*i+3) << 24;
     }
 
-    SkJumper_MemoryCtx ptr = { rgba, 0 };
+    SkRasterPipeline_MemoryCtx ptr = { rgba, 0 };
 
     SkRasterPipeline_<256> p;
     p.append(SkRasterPipeline::load_8888,  &ptr);
@@ -193,7 +192,7 @@
 
     uint32_t rgba = 0xff00ff00;
 
-    SkJumper_MemoryCtx ptr = { &rgba, 0 };
+    SkRasterPipeline_MemoryCtx ptr = { &rgba, 0 };
 
     SkRasterPipeline_<256> p;
     p.append(SkRasterPipeline::load_8888,  &ptr);