Vulkan

VulkanDesign.txt

@@ -0,0 +1,5 @@
+
+Problems:
+
+    1. VersionedResources are awkward to work through at times.
+

gradle/libs.versions.toml

@@ -34,6 +34,8 @@ lwjgl3-opencl   = { module = "org.lwjgl:lwjgl-opencl",   version.ref = "lwjgl3"
 lwjgl3-opengl   = { module = "org.lwjgl:lwjgl-opengl",   version.ref = "lwjgl3" }
 lwjgl3-openvr   = { module = "org.lwjgl:lwjgl-openvr",   version.ref = "lwjgl3" }
 lwjgl3-ovr      = { module = "org.lwjgl:lwjgl-ovr",      version.ref = "lwjgl3" }
+lwjgl3-vulkan   = { module = "org.lwjgl:lwjgl-vulkan",   version.ref = "lwjgl3" }
+lwjgl3-shaderc  = { module = "org.lwjgl:lwjgl-shaderc",  version.ref = "lwjgl3" }
 
 mokito-core = "org.mockito:mockito-core:3.12.4"
 

jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java

@@ -43,7 +43,7 @@
 import com.jme3.system.JmeSystem;
 import com.jme3.system.Timer;
 import com.jme3.texture.FrameBuffer;
-import com.jme3.texture.Image;
+import com.jme3.texture.GlImage;
 import com.jme3.util.AndroidScreenshots;
 import com.jme3.util.BufferUtils;
 import java.io.File;
@@ -241,7 +241,7 @@ public void addImage(Renderer renderer, FrameBuffer out) {
                 final WorkItem item = freeItems.take();
                 usedItems.add(item);
                 item.buffer.clear();
-                renderer.readFrameBufferWithFormat(out, item.buffer, Image.Format.BGRA8);
+                renderer.readFrameBufferWithFormat(out, item.buffer, GlImage.Format.BGRA8);
                 executor.submit(new Callable<Void>() {
 
                     @Override

jme3-android/src/main/java/com/jme3/texture/plugins/AndroidBufferImageLoader.java

@@ -37,7 +37,7 @@
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.TextureKey;
-import com.jme3.texture.Image;
+import com.jme3.texture.GlImage;
 import com.jme3.texture.image.ColorSpace;
 import com.jme3.util.BufferUtils;
 import java.io.IOException;
@@ -72,7 +72,7 @@ private static void convertARGBtoABGR(int[] src, int srcOff, int[] dst, int dstO
     @Override
     public Object load(AssetInfo assetInfo) throws IOException {
         Bitmap bitmap;
-        Image.Format format;
+        GlImage.Format format;
         int bpp;
 
         BitmapFactory.Options options = new BitmapFactory.Options();
@@ -102,15 +102,15 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
         switch (bitmap.getConfig()) {
             case ALPHA_8:
-                format = Image.Format.Alpha8;
+                format = GlImage.Format.Alpha8;
                 bpp = 1;
                 break;
             case ARGB_8888:
-                format = Image.Format.RGBA8;
+                format = GlImage.Format.RGBA8;
                 bpp = 4;
                 break;
             case RGB_565:
-                format = Image.Format.RGB565;
+                format = GlImage.Format.RGB565;
                 bpp = 2;
                 break;
             default:
@@ -124,7 +124,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
         ByteBuffer data = BufferUtils.createByteBuffer(bitmap.getWidth() * bitmap.getHeight() * bpp);
 
-        if (format == Image.Format.RGBA8) {
+        if (format == GlImage.Format.RGBA8) {
             int[] pixelData = new int[width * height];
             bitmap.getPixels(pixelData, 0,  width, 0, 0,          width,  height);
 
@@ -163,7 +163,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
         bitmap.recycle();
 
-        Image image = new Image(format, width, height, data, ColorSpace.sRGB);
+        GlImage image = new GlImage(format, width, height, data, ColorSpace.sRGB);
 
         return image;
     }

jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java

@@ -34,7 +34,7 @@
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.TextureKey;
-import com.jme3.texture.Image;
+import com.jme3.texture.GlImage;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -52,10 +52,10 @@ public class AndroidNativeImageLoader  implements AssetLoader {
          System.loadLibrary("decodejme");
     }
 
-    private static native Image load(InputStream in, boolean flipY, byte[] tmpArray) throws IOException;
+    private static native GlImage load(InputStream in, boolean flipY, byte[] tmpArray) throws IOException;
 
     @Override
-    public Image load(AssetInfo info) throws IOException {
+    public GlImage load(AssetInfo info) throws IOException {
         boolean flip = ((TextureKey) info.getKey()).isFlipY();
         try (final InputStream in = info.openStream()) {
             return load(in, flip, tmpArray);

jme3-core/build.gradle

@@ -19,6 +19,58 @@ dependencies {
     testRuntimeOnly project(':jme3-testdata')
     testImplementation project(':jme3-desktop')
     testRuntimeOnly project(':jme3-plugins')
+
+    // Use LWJGL3 directly in core. This destroys LWJGL2 and JOGL compatibility.
+    api (libs.lwjgl3.awt) {
+        exclude group: 'org.lwjgl', module: 'lwjgl'
+    }
+    api libs.lwjgl3.base
+    api libs.lwjgl3.glfw
+    api libs.lwjgl3.jawt
+    api libs.lwjgl3.jemalloc
+    api libs.lwjgl3.openal
+    api libs.lwjgl3.opencl
+    api libs.lwjgl3.opengl
+    api libs.lwjgl3.vulkan
+    api libs.lwjgl3.shaderc
+
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-windows') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-windows-x86') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux-arm32') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-macos') })
+    runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-macos-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-windows') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-windows-x86') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux-arm32') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-macos') })
+    runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-macos-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-windows') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-windows-x86') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux-arm32') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-macos') })
+    runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-macos-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-windows') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-windows-x86') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux-arm32') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-macos') })
+    runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-macos-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-windows') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-windows-x86') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux-arm32') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-macos') })
+    runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-macos-arm64') })
+    runtimeOnly(variantOf(libs.lwjgl3.shaderc) { classifier('natives-linux') })
+
 }
 
 task updateVersionPropertiesFile {

jme3-core/src/main/java/com/jme3/anim/MorphControl.java

@@ -79,7 +79,7 @@ public class MorphControl extends AbstractControl implements Savable {
     private float[] tmpNormArray;
     private float[] tmpTanArray;
 
-    private static final VertexBuffer.Type bufferTypes[] = VertexBuffer.Type.values();
+    private static final GlVertexBuffer.Type bufferTypes[] = GlVertexBuffer.Type.values();
 
     @Override
     public void setSpatial(Spatial spatial) {
@@ -237,49 +237,49 @@ private int getMaxGPUTargets(RenderManager rm, Geometry geom, Material mat, int
     }
 
     private int bindMorphTargetBuffer(Mesh mesh, int targetNumBuffers, int boundBufferIdx, MorphTarget t) {
-        int start = VertexBuffer.Type.MorphTarget0.ordinal();
+        int start = GlVertexBuffer.Type.MorphTarget0.ordinal();
         if (targetNumBuffers >= 1) {
-            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(VertexBuffer.Type.Position));
+            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(GlVertexBuffer.Type.Position));
             boundBufferIdx++;
         }
         if (targetNumBuffers >= 2) {
-            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(VertexBuffer.Type.Normal));
+            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(GlVertexBuffer.Type.Normal));
             boundBufferIdx++;
         }
         if (!approximateTangents && targetNumBuffers == 3) {
-            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(VertexBuffer.Type.Tangent));
+            activateBuffer(mesh, boundBufferIdx, start, t.getBuffer(GlVertexBuffer.Type.Tangent));
             boundBufferIdx++;
         }
         return boundBufferIdx;
     }
 
     private void writeCpuBuffer(int targetNumBuffers, MorphTarget mt) {
         if (targetNumBuffers >= 1) {
-            FloatBuffer dest = mt.getBuffer(VertexBuffer.Type.Position);
+            FloatBuffer dest = mt.getBuffer(GlVertexBuffer.Type.Position);
             dest.rewind();
             dest.put(tmpPosArray, 0, dest.capacity());
         }
         if (targetNumBuffers >= 2) {
-            FloatBuffer dest = mt.getBuffer(VertexBuffer.Type.Normal);
+            FloatBuffer dest = mt.getBuffer(GlVertexBuffer.Type.Normal);
             dest.rewind();
             dest.put(tmpNormArray, 0, dest.capacity());
         }
         if (!approximateTangents && targetNumBuffers == 3) {
-            FloatBuffer dest = mt.getBuffer(VertexBuffer.Type.Tangent);
+            FloatBuffer dest = mt.getBuffer(GlVertexBuffer.Type.Tangent);
             dest.rewind();
             dest.put(tmpTanArray, 0, dest.capacity());
         }
     }
 
     private void mergeMorphTargets(int targetNumBuffers, float weight, MorphTarget t, boolean init) {
         if (targetNumBuffers >= 1) {
-            mergeTargetBuffer(tmpPosArray, weight, t.getBuffer(VertexBuffer.Type.Position), init);
+            mergeTargetBuffer(tmpPosArray, weight, t.getBuffer(GlVertexBuffer.Type.Position), init);
         }
         if (targetNumBuffers >= 2) {
-            mergeTargetBuffer(tmpNormArray, weight, t.getBuffer(VertexBuffer.Type.Normal), init);
+            mergeTargetBuffer(tmpNormArray, weight, t.getBuffer(GlVertexBuffer.Type.Normal), init);
         }
         if (!approximateTangents && targetNumBuffers == 3) {
-            mergeTargetBuffer(tmpTanArray, weight, t.getBuffer(VertexBuffer.Type.Tangent), init);
+            mergeTargetBuffer(tmpTanArray, weight, t.getBuffer(GlVertexBuffer.Type.Tangent), init);
         }
     }
 
@@ -306,8 +306,8 @@ private void mergeTargetBuffer(float[] array, float weight, FloatBuffer src, boo
     }
 
     private void activateBuffer(Mesh mesh, int idx, int start, FloatBuffer b) {
-        VertexBuffer.Type t = bufferTypes[start + idx];
-        VertexBuffer vb = mesh.getBuffer(t);
+        GlVertexBuffer.Type t = bufferTypes[start + idx];
+        GlVertexBuffer vb = mesh.getBuffer(t);
         // only set the buffer if it's different
         if (vb == null || vb.getData() != b) {
             mesh.setBuffer(t, 3, b);
@@ -324,30 +324,30 @@ private float[] ensureCapacity(float[] tmpArray, int size) {
     private MorphTarget initCpuMorphTarget(Geometry geom) {
         MorphTarget res = new MorphTarget();
         MorphTarget mt = geom.getMesh().getMorphTargets()[0];
-        FloatBuffer b = mt.getBuffer(VertexBuffer.Type.Position);
+        FloatBuffer b = mt.getBuffer(GlVertexBuffer.Type.Position);
         if (b != null) {
-            res.setBuffer(VertexBuffer.Type.Position, BufferUtils.createFloatBuffer(b.capacity()));
+            res.setBuffer(GlVertexBuffer.Type.Position, BufferUtils.createFloatBuffer(b.capacity()));
         }
-        b = mt.getBuffer(VertexBuffer.Type.Normal);
+        b = mt.getBuffer(GlVertexBuffer.Type.Normal);
         if (b != null) {
-            res.setBuffer(VertexBuffer.Type.Normal, BufferUtils.createFloatBuffer(b.capacity()));
+            res.setBuffer(GlVertexBuffer.Type.Normal, BufferUtils.createFloatBuffer(b.capacity()));
         }
         if (!approximateTangents) {
-            b = mt.getBuffer(VertexBuffer.Type.Tangent);
+            b = mt.getBuffer(GlVertexBuffer.Type.Tangent);
             if (b != null) {
-                res.setBuffer(VertexBuffer.Type.Tangent, BufferUtils.createFloatBuffer(b.capacity()));
+                res.setBuffer(GlVertexBuffer.Type.Tangent, BufferUtils.createFloatBuffer(b.capacity()));
             }
         }
         return res;
     }
 
     private int getTargetNumBuffers(MorphTarget morphTarget) {
         int num = 0;
-        if (morphTarget.getBuffer(VertexBuffer.Type.Position) != null) num++;
-        if (morphTarget.getBuffer(VertexBuffer.Type.Normal) != null) num++;
+        if (morphTarget.getBuffer(GlVertexBuffer.Type.Position) != null) num++;
+        if (morphTarget.getBuffer(GlVertexBuffer.Type.Normal) != null) num++;
 
         // if tangents are not needed we don't count the tangent buffer
-        if (!approximateTangents && morphTarget.getBuffer(VertexBuffer.Type.Tangent) != null) {
+        if (!approximateTangents && morphTarget.getBuffer(GlVertexBuffer.Type.Tangent) != null) {
             num++;
         }
         return num;
@@ -366,10 +366,10 @@ private int getTargetNumBuffers(MorphTarget morphTarget) {
      */
     private int getRemainingBuffers(Mesh mesh, Renderer renderer) {
         int nbUsedBuffers = 0;
-        for (VertexBuffer vb : mesh.getBufferList().getArray()) {
-            boolean isMorphBuffer = vb.getBufferType().ordinal() >= VertexBuffer.Type.MorphTarget0.ordinal() && vb.getBufferType().ordinal() <= VertexBuffer.Type.MorphTarget9.ordinal();
-            if (vb.getBufferType() == VertexBuffer.Type.Index || isMorphBuffer) continue;
-            if (vb.getUsage() != VertexBuffer.Usage.CpuOnly) {
+        for (GlVertexBuffer vb : mesh.getBufferList().getArray()) {
+            boolean isMorphBuffer = vb.getBufferType().ordinal() >= GlVertexBuffer.Type.MorphTarget0.ordinal() && vb.getBufferType().ordinal() <= GlVertexBuffer.Type.MorphTarget9.ordinal();
+            if (vb.getBufferType() == GlVertexBuffer.Type.Index || isMorphBuffer) continue;
+            if (vb.getUsage() != GlVertexBuffer.Usage.CpuOnly) {
                 nbUsedBuffers++;
             }
         }
@@ -478,7 +478,7 @@ public void visit(Geometry geom) {
                 // this code makes sure that if the mesh has no hardware skinning buffers hardware skinning won't be activated.
                 // this is important, because if HW skinning is activated the shader will declare 2 additional useless attributes,
                 // and we desperately need all the attributes we can find for Morph animation.
-                if (mesh.getBuffer(VertexBuffer.Type.HWBoneIndex) == null && !geom.getLocalMatParamOverrides().contains(nullNumberOfBones)) {
+                if (mesh.getBuffer(GlVertexBuffer.Type.HWBoneIndex) == null && !geom.getLocalMatParamOverrides().contains(nullNumberOfBones)) {
                     geom.addMatParamOverride(nullNumberOfBones);
                 }
             }