mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Pufferfish)
Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@8a81176 Update SIMD to allow Java 18 pufferfish-gg/Pufferfish@9b5a480 Update YAML libs
This commit is contained in:
@@ -19,8 +19,6 @@ GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Based on pufferfish-gg/Pufferfish#bf3b9b977dbf387a2bdf2a5930a680630a843fe0
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 01798255d45f2a642df00156f11dd2bcd8108079..9d7bd0f965c7dc3a60246310688aa5f93a4594a4 100644
|
||||
--- a/build.gradle.kts
|
||||
@@ -216,7 +214,7 @@ index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8e
|
||||
+}
|
||||
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..77cf83bd096bbf6bfa7e510d97716b514384d9ff
|
||||
index 0000000000000000000000000000000000000000..3e36d19582172232f617ffc7045dd2012665b99a
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
|
||||
@@ -0,0 +1,29 @@
|
||||
@@ -233,7 +231,7 @@ index 0000000000000000000000000000000000000000..77cf83bd096bbf6bfa7e510d97716b51
|
||||
+ @Deprecated
|
||||
+ public static boolean canEnable() {
|
||||
+ try {
|
||||
+ if (SIMDDetection.getJavaVersion() != 17) {
|
||||
+ if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) {
|
||||
+ return false;
|
||||
+ } else {
|
||||
+ IntVector oneVector = IntVector.broadcast(IntVector.SPECIES_256, 1);
|
||||
|
||||
Reference in New Issue
Block a user