Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480)

Pufferfish Changes:
pufferfish-gg/Pufferfish@81f546b Fix SIMD when pixel counts aren't divisible by 8
This commit is contained in:
BillyGalbreath
2022-02-15 10:47:49 -06:00
parent cfe8efe1f0
commit d413f6f631
4 changed files with 10 additions and 10 deletions

View File

@@ -287,7 +287,7 @@ index 0000000000000000000000000000000000000000..1bbec0b032a4765f5e55a1475a1b7401
+}
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
new file mode 100644
index 0000000000000000000000000000000000000000..48b67864752d6da4e2cc626e746eeb7c32b6524f
index 0000000000000000000000000000000000000000..2341b564b6383d5eca5fafe80273e046bfea070e
--- /dev/null
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
@@ -0,0 +1,79 @@
@@ -306,7 +306,7 @@ index 0000000000000000000000000000000000000000..48b67864752d6da4e2cc626e746eeb7c
+ public static void matchColorVectorized(int[] in, byte[] out) {
+ int speciesLength = IntVector.SPECIES_256.length();
+ int i;
+ for (i = 0; i < in.length; i += speciesLength) {
+ for (i = 0; i < in.length - speciesLength; i += speciesLength) {
+ float[] redsArr = new float[speciesLength];
+ float[] bluesArr = new float[speciesLength];
+ float[] greensArr = new float[speciesLength];