Skip to content

Fix nvoglv64.dll crash in VoxelShadowGrid by using PBO for texture upload #145

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

Merged
Ocelot5836 merged 1 commit into from
May 23, 2026
Merged

Fix nvoglv64.dll crash in VoxelShadowGrid by using PBO for texture upload #145

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
26 changes: 21 additions & 5 deletions common/src/main/java/foundry/veil/impl/client/render/light/VoxelShadowGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

import static org.lwjgl.opengl.GL11C.*;
import static org.lwjgl.opengl.GL12C.*;
import static org.lwjgl.opengl.GL15C.*;
import static org.lwjgl.opengl.GL21C.GL_PIXEL_UNPACK_BUFFER;
import static org.lwjgl.opengl.GL30C.GL_R8;

@ApiStatus.Internal
Expand All @@ -41,6 +43,7 @@ public final class VoxelShadowGrid {

private static final Vector3f uniformGridPos = new Vector3f();
private static int textureId;
private static int pboId;

private static ResourceKey<Level> gridDimension;
private static int originX, originY, originZ;
Expand Down Expand Up @@ -151,6 +154,10 @@ public static void clearLevel() {
public static void close() {
RenderSystem.assertOnRenderThreadOrInit();
clearLevel();
if (pboId != 0) {
glDeleteBuffers(pboId);
pboId = 0;
}
if (textureId != 0) {
glDeleteTextures(textureId);
textureId = 0;
Expand Down Expand Up @@ -421,19 +428,23 @@ private static byte voxelOccupancy(ClientLevel level, BlockPos pos, BlockState s
}

private static void uploadBuffer(ByteBuffer buffer) {
if (buffer == null) {
if (buffer == null || pboId == 0) {
return;
}

ByteBuffer upload = buffer.duplicate();
upload.position(0);
upload.limit(GRID_VOLUME);
buffer.position(0);
buffer.limit(GRID_VOLUME);

int unpackAlignment = glGetInteger(GL_UNPACK_ALIGNMENT);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pboId);
glBufferData(GL_PIXEL_UNPACK_BUFFER, buffer, GL_STREAM_DRAW);

glBindTexture(GL_TEXTURE_3D, textureId);
glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, GRID_SIZE, GRID_SIZE, GRID_SIZE, GL_RED, GL_UNSIGNED_BYTE, upload);
glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, GRID_SIZE, GRID_SIZE, GRID_SIZE, GL_RED, GL_UNSIGNED_BYTE, 0L);
glBindTexture(GL_TEXTURE_3D, 0);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, unpackAlignment);
}

Expand All @@ -452,6 +463,11 @@ private static void ensureTexture() {
glTexImage3D(GL_TEXTURE_3D, 0, GL_R8, GRID_SIZE, GRID_SIZE, GRID_SIZE, 0, GL_RED, GL_UNSIGNED_BYTE, zeros);
MemoryUtil.memFree(zeros);
glBindTexture(GL_TEXTURE_3D, 0);

pboId = glGenBuffers();
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pboId);
glBufferData(GL_PIXEL_UNPACK_BUFFER, GRID_VOLUME, GL_STREAM_DRAW);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
}

private static boolean hasOccludedLights() {
Expand Down
Loading