Skip to content

Submit eyes before processing other passes. #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thejudge156 wants to merge 1 commit into
base: openxr-1.21.4
Choose a base branch
from
Open

Submit eyes before processing other passes. #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/src/main/java/org/vivecraft/client_vr/provider/MCVR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ public void destroy() {
ME = null;
}

public void prerender() {}

/**
* triggers a haptic pulse on the give controller, as soon as possible
*
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/org/vivecraft/client_vr/provider/openxr/OpenXRStereoRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mojang.blaze3d.pipeline.RenderTarget;
import net.minecraft.util.Tuple;
import net.minecraft.util.profiling.Profiler;
import org.joml.Matrix4f;
import org.lwjgl.PointerBuffer;
import org.lwjgl.openxr.*;
Expand All @@ -19,7 +20,6 @@ public class OpenXRStereoRenderer extends VRRenderer {
private int swapIndex;
private VRLayeredRenderTarget[] leftFramebuffers;
private VRLayeredRenderTarget[] rightFramebuffers;
private boolean render;
private XrCompositionLayerProjectionView.Buffer projectionLayerViews;
private boolean recalculateProjectionMatrix = true;

Expand Down Expand Up @@ -70,7 +70,7 @@ public void createRenderTexture(int width, int height) {
public void setupRenderConfiguration(boolean render) throws IOException, RenderConfigException {
super.setupRenderConfiguration(render);

if (!render) return;
if(!render) return;

this.projectionLayerViews = XrCompositionLayerProjectionView.calloc(2);
try (MemoryStack stack = MemoryStack.stackPush()) {
Expand Down
36 changes: 19 additions & 17 deletions common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,26 +211,28 @@ public static void renderAndSubmit(boolean renderLevel, DeltaTracker.Timer delta
}

DATA_HOLDER.isFirstPass = false;
}
// now we are done with rendering
Profiler.get().pop();

// Submit the frame immediately after eyes are done
if(renderpass == RenderPass.RIGHT) {
Profiler.get().push("vrMirror");
// use the vanilla target for the mirror
RenderPassManager.setMirrorRenderPass();
ShaderHelper.drawMirror();
RenderHelper.checkGLError("post-mirror");

Profiler.get().popPush("Display/Reproject");
try {
DATA_HOLDER.vrRenderer.endFrame();
} catch (RenderConfigException exception) {
VRSettings.LOGGER.error("Vivecraft: error ending frame: {}", exception.error.getString());
}
Profiler.get().pop();
RenderHelper.checkGLError("post submit");
}
}
DATA_HOLDER.vrPlayer.postRender(deltaTracker.getGameTimeDeltaPartialTick(true));

Profiler.get().push("vrMirror");
// use the vanilla target for the mirror
RenderPassManager.setMirrorRenderPass();
ShaderHelper.drawMirror();
RenderHelper.checkGLError("post-mirror");

Profiler.get().popPush("Display/Reproject");

try {
DATA_HOLDER.vrRenderer.endFrame();
} catch (RenderConfigException exception) {
VRSettings.LOGGER.error("Vivecraft: error ending frame: {}", exception.error.getString());
}
// now we are done with rendering
Profiler.get().pop();
RenderHelper.checkGLError("post submit");
}
}
35 changes: 18 additions & 17 deletions common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,23 +211,6 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
// switch vr in the menu, or when allowed by the server
vivecraft$switchVRState(vrActive);
}
if (VRState.VR_RUNNING) {
ClientDataHolderVR.getInstance().frameIndex++;
RenderPassManager.setGUIRenderPass();
// reset camera position, if there is one, since it only gets set at the start of rendering, and the last renderpass can be anywhere
if (this.gameRenderer != null && this.gameRenderer.getMainCamera() != null && this.level != null &&
this.getCameraEntity() != null)
{
this.gameRenderer.getMainCamera().setup(this.level, this.getCameraEntity(), false, false,
this.level.tickRateManager().isEntityFrozen(this.getCameraEntity()) ? 1.0f :
this.deltaTracker.getGameTimeDeltaPartialTick(true));
}

Profiler.get().push("VR Poll/VSync");
ClientDataHolderVR.getInstance().vr.poll(ClientDataHolderVR.getInstance().frameIndex);
Profiler.get().pop();
ClientDataHolderVR.getInstance().vrPlayer.postPoll();
}
}

@Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;tick()V"))
Expand Down Expand Up @@ -257,6 +240,22 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
@Inject(method = "runTick", at = @At(value = "CONSTANT", args = "stringValue=render"))
private void vivecraft$preRender(CallbackInfo ci) {
if (VRState.VR_RUNNING) {
ClientDataHolderVR.getInstance().frameIndex++;
RenderPassManager.setGUIRenderPass();
// reset camera position, if there is one, since it only gets set at the start of rendering, and the last renderpass can be anywhere
if (this.gameRenderer != null && this.gameRenderer.getMainCamera() != null && this.level != null &&
this.getCameraEntity() != null)
{
this.gameRenderer.getMainCamera().setup(this.level, this.getCameraEntity(), false, false,
this.level.tickRateManager().isEntityFrozen(this.getCameraEntity()) ? 1.0f :
this.deltaTracker.getGameTimeDeltaPartialTick(true));
}

Profiler.get().push("VR Poll/VSync");
ClientDataHolderVR.getInstance().vr.poll(ClientDataHolderVR.getInstance().frameIndex);
Profiler.get().pop();
ClientDataHolderVR.getInstance().vrPlayer.postPoll();

Profiler.get().push("preRender");
ClientDataHolderVR.getInstance().vrPlayer.preRender(this.deltaTracker.getGameTimeDeltaPartialTick(true));
VRHotkeys.updateMovingThirdPersonCam();
Expand All @@ -266,6 +265,8 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {

@ModifyArg(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;render(Lnet/minecraft/client/DeltaTracker;Z)V"))
private boolean vivecraft$setupRenderGUI(boolean renderLevel) {
Profiler.get().popPush("updatePose/Vsync");

if (VRState.VR_RUNNING) {
try {
Profiler.get().push("setupRenderConfiguration");
Expand Down