diff options
| author | Philip Jordan <[email protected]> | 2020-02-01 12:55:37 +1300 |
|---|---|---|
| committer | Philip Jordan <[email protected]> | 2020-02-01 12:55:37 +1300 |
| commit | 8a8c4baf3189a588c43efd04f5dfc72d1b38af63 (patch) | |
| tree | 53c6f3109d366ca55e99ccc93879c4f4a6b687b2 | |
| parent | e3bc1436f66167ced8afbf9dfd700a1144aba7a2 (diff) | |
Removed version dependent static values from pipeline code
The Pipelines check for a common bug based on the java JRE version
number, and use the Jogl Platform convenience class, however this class
has renamed the Version19 static value in 2.3.2 to Version9 in 2.4.0, so
Java3D was jogl version dependent, this is change to a different test to
avoid this lock in.
| -rw-r--r-- | src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/jogamp/java3d/JoglPipeline.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java index e9e12e0..3d60105 100644 --- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java +++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java @@ -7381,8 +7381,8 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline } if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version19) >= 0) || // 1.9 or 1.8 > 51 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) >= 0 && Platform.JAVA_VERSION_UPDATE > 51) && // + (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 + (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM { System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and"); diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java index df6ef80..2c5e4b6 100644 --- a/src/main/java/org/jogamp/java3d/JoglPipeline.java +++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java @@ -8130,8 +8130,8 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) } if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version19) >= 0) || // 1.9 or 1.8 > 51 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) >= 0 && Platform.JAVA_VERSION_UPDATE > 51) && // + (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 + (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM { System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and"); |