Swap index and resetting the left framebuffers

Author: thejudge156

common/src/main/java/org/vivecraft/client_vr/provider/openxr/OpenXRStereoRenderer.java

@@ -1,11 +1,9 @@
 package org.vivecraft.client_vr.provider.openxr;
 
-import com.mojang.blaze3d.opengl.GlStateManager;
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import net.minecraft.util.Tuple;
 import org.joml.Matrix4f;
 import org.lwjgl.PointerBuffer;
-import org.lwjgl.opengl.GL11C;
 import org.lwjgl.openxr.*;
 import org.lwjgl.system.MemoryStack;
 import org.vivecraft.client_vr.VRTextureTarget;
@@ -18,7 +16,7 @@
 
 public class OpenXRStereoRenderer extends VRRenderer {
     private final MCOpenXR openxr;
-    private int[] swapIndex = new int[2];
+    private final int[] swapIndex = new int[] {0, 0}; // Needs to be initialized otherwise stuff splodes
     private VRTextureTarget[] leftFramebuffers;
     private VRTextureTarget[] rightFramebuffers;
     private boolean render;
@@ -49,8 +47,11 @@ public void createRenderTexture(int width, int height) {
                         XrSwapchainImageBaseHeader.create(swapchainImageBuffer.address(), swapchainImageBuffer.capacity()));
                 this.openxr.logError(error, "xrEnumerateSwapchainImages", "get images");
 
-                this.leftFramebuffers = new VRTextureTarget[imageCount];
-                this.rightFramebuffers = new VRTextureTarget[imageCount];
+                if(i == 0) {
+                    this.leftFramebuffers = new VRTextureTarget[imageCount];
+                } else {
+                    this.rightFramebuffers = new VRTextureTarget[imageCount];
+                }
 
                 String leftError = "";
                 String rightError = "";
@@ -103,7 +104,7 @@ public void setupRenderConfiguration(boolean render) throws IOException, RenderC
                         .fov(this.openxr.viewBuffer.get(i).fov())
                         .subImage();
                 subImage.swapchain(this.openxr.swapchain[i]);
-                subImage.imageRect().offset().set(i * this.openxr.width, 0);
+                subImage.imageRect().offset().set(0, 0);
                 subImage.imageRect().extent().set(this.openxr.width, this.openxr.height);
             }
             this.recalculateProjectionMatrix = true;
@@ -197,13 +198,19 @@ public void destroy() {
 
         if (this.leftFramebuffers != null) {
             for (VRTextureTarget leftFramebuffer : this.leftFramebuffers) {
+                if(leftFramebuffer == null) {
+                    continue;
+                }
                 leftFramebuffer.destroyBuffers();
             }
             this.leftFramebuffers = null;
         }
 
         if (this.rightFramebuffers != null) {
             for (VRTextureTarget rightFramebuffer : this.rightFramebuffers) {
+                if(rightFramebuffer == null) {
+                    continue;
+                }
                 rightFramebuffer.destroyBuffers();
             }
             this.rightFramebuffers = null;

common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java

@@ -239,7 +239,7 @@ public static void renderAndSubmit(boolean renderLevel, DeltaTracker.Timer delta
         Profiler.get().pop();
 
         DATA_HOLDER.vrPlayer.postRender(deltaTracker.getGameTimeDeltaPartialTick(true));
-        Profiler.get().popPush("Display/Reproject");
+        Profiler.get().push("Display/Reproject");
 
         try {
             DATA_HOLDER.vrRenderer.endFrame();