Skip to content

Command Buffer Packing #9

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
RuffledPlume wants to merge 9 commits into
base: zone-renderer
Choose a base branch
from
+79 −68
Open

Command Buffer Packing #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0876ca
CommandBuffer packing
RuffledPlume Oct 20, 2025
c0369fc
MultiDrawArrays is now packed
RuffledPlume Oct 20, 2025
89ce773
Pack SetBaseOffset too
RuffledPlume Oct 20, 2025
d61b071
CommandBuffer packing
RuffledPlume Oct 20, 2025
d936c3a
MultiDrawArrays is now packed
RuffledPlume Oct 20, 2025
52c1a85
Pack SetBaseOffset too
RuffledPlume Oct 20, 2025
72a6259
Merge remote-tracking branch 'origin/CommandBuffer-Packing' into Comm…
RuffledPlume Oct 20, 2025
e92d609
Minor edits
aHooder Oct 21, 2025
a3e8849
Use DrawArrays instead of MultiDrawArrays if length is 1
RuffledPlume Oct 21, 2025
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
18 changes: 15 additions & 3 deletions src/main/java/rs117/hd/renderer/zone/Zone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ void renderOpaque(CommandBuffer cmd, int zx, int zz, int minLevel, int currentLe

cmd.SetBaseOffset(zx << 10, 0, zz << 10);
cmd.BindVertexArray(glVao);
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
if(glDrawOffset.length > 1) {
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
} else {
cmd.DrawArrays(GL_TRIANGLES, glDrawOffset[0], glDrawLength[0]);
}
}

void renderOpaqueLevel(CommandBuffer cmd, int zx, int zz, int level) {
Expand All @@ -254,7 +258,11 @@ void renderOpaqueLevel(CommandBuffer cmd, int zx, int zz, int level) {

cmd.SetBaseOffset(zx << 10, 0, zz << 10);
cmd.BindVertexArray(glVao);
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
if(glDrawOffset.length > 1) {
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
} else {
cmd.DrawArrays(GL_TRIANGLES, glDrawOffset[0], glDrawLength[0]);
}
}

private static void pushRange(int start, int end) {
Expand Down Expand Up @@ -625,7 +633,11 @@ private void flush(CommandBuffer cmd) {
} else if (drawIdx != 0) {
convertForDraw(VAO.VERT_SIZE);
cmd.BindVertexArray(lastVao);
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
if(glDrawOffset.length > 1) {
cmd.MultiDrawArrays(GL_TRIANGLES, glDrawOffset, glDrawLength);
} else {
cmd.DrawArrays(GL_TRIANGLES, glDrawOffset[0], glDrawLength[0]);
}
drawIdx = 0;
}
}
Expand Down
129 changes: 64 additions & 65 deletions src/main/java/rs117/hd/utils/CommandBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public class CommandBuffer {

private static final int GL_TOGGLE_TYPE = 9; // Combined glEnable & glDisable

private static final long INT_MASK = 0xFFFF_FFFFL;
private static final int INT_MASK = 0xFFFF_FFFF;
private static final int DRAW_MODE_MASK = 0xF;

@Setter
private UBOCommandBuffer uboCommandBuffer;
Expand All @@ -42,73 +43,65 @@ private void ensureCapacity(int numLongs) {
}

public void SetBaseOffset(int x, int y, int z) {
ensureCapacity(4);
cmd[writeHead++] = UNIFORM_BASE_OFFSET;
cmd[writeHead++] = x;
cmd[writeHead++] = y;
cmd[writeHead++] = z;
ensureCapacity(2);
cmd[writeHead++] = UNIFORM_BASE_OFFSET & 0xFF | (long) x << 32;
cmd[writeHead++] = (long) y << 32 | z & INT_MASK;
}

public void SetWorldViewIndex(int index) {
ensureCapacity(2);
cmd[writeHead++] = UNIFORM_WORLD_VIEW_ID;
cmd[writeHead++] = index;
ensureCapacity(1);
cmd[writeHead++] = UNIFORM_WORLD_VIEW_ID & 0xFF | (long) index << 8;
}

public void BindVertexArray(int vao) {
ensureCapacity(2);
cmd[writeHead++] = GL_BIND_VERTEX_ARRAY_TYPE;
cmd[writeHead++] = vao;
ensureCapacity(1);
cmd[writeHead++] = GL_BIND_VERTEX_ARRAY_TYPE & 0xFF | (long) vao << 8;
}

public void BindElementsArray(int ebo) {
ensureCapacity(2);
cmd[writeHead++] = GL_BIND_ELEMENTS_ARRAY_TYPE;
cmd[writeHead++] = ebo;
ensureCapacity(1);
cmd[writeHead++] = GL_BIND_ELEMENTS_ARRAY_TYPE & 0xFF | (long) ebo << 8;
}

public void DepthMask(boolean writeDepth) {
ensureCapacity(2);
cmd[writeHead++] = GL_DEPTH_MASK_TYPE;
cmd[writeHead++] = writeDepth ? 1 : 0;
ensureCapacity(1);
cmd[writeHead++] = GL_DEPTH_MASK_TYPE & 0xFF | (writeDepth ? 1 : 0) << 8;
}

public void ColorMask(boolean writeRed, boolean writeGreen, boolean writeBlue, boolean writeAlpha) {
ensureCapacity(5);
cmd[writeHead++] = GL_COLOR_MASK_TYPE;
cmd[writeHead++] = writeRed ? 1 : 0;
cmd[writeHead++] = writeGreen ? 1 : 0;
cmd[writeHead++] = writeBlue ? 1 : 0;
cmd[writeHead++] = writeAlpha ? 1 : 0;
ensureCapacity(1);
cmd[writeHead++] =
GL_COLOR_MASK_TYPE & 0xFF |
(writeRed ? 1 : 0) << 8 |
(writeGreen ? 1 : 0) << 9 |
(writeBlue ? 1 : 0) << 10 |
(writeAlpha ? 1 : 0) << 11;
}

public void MultiDrawArrays(int mode, int[] offsets, int[] counts) {
assert offsets.length == counts.length;

ensureCapacity(3 + (offsets.length * 2));
cmd[writeHead++] = GL_MULTI_DRAW_ARRAYS_TYPE;
cmd[writeHead++] = mode;
cmd[writeHead++] = offsets.length;
for (int i = 0; i < offsets.length; i++) {
cmd[writeHead++] = offsets[i];
cmd[writeHead++] = counts[i];
}
assert (mode & DRAW_MODE_MASK) == mode;
if (offsets.length == 0)
return;

ensureCapacity(1 + offsets.length);
cmd[writeHead++] = GL_MULTI_DRAW_ARRAYS_TYPE & 0xFF | mode << 8 | (long) offsets.length << 32;
for (int i = 0; i < offsets.length; i++)
cmd[writeHead++] = (long) offsets[i] << 32 | counts[i] & INT_MASK;
}

public void DrawElements(int mode, int vertexCount, long offset) {
ensureCapacity(4);
cmd[writeHead++] = GL_DRAW_ELEMENTS_TYPE;
cmd[writeHead++] = mode;
cmd[writeHead++] = vertexCount;
assert (mode & DRAW_MODE_MASK) == mode;
ensureCapacity(2);
cmd[writeHead++] = GL_DRAW_ELEMENTS_TYPE & 0xFF | mode << 8 | (long) vertexCount << 32;
cmd[writeHead++] = offset;
}

public void DrawArrays(int mode, int offset, int vertexCount) {
ensureCapacity(4);
cmd[writeHead++] = GL_DRAW_ARRAYS_TYPE;
cmd[writeHead++] = mode;
cmd[writeHead++] = offset;
cmd[writeHead++] = vertexCount;
assert (mode & DRAW_MODE_MASK) == mode;
ensureCapacity(2);
cmd[writeHead++] = GL_DRAW_ARRAYS_TYPE & 0xFF | mode << 8;
cmd[writeHead++] = (long) offset << 32 | vertexCount & INT_MASK;
}

public void Enable(int capability) {
Expand All @@ -130,49 +123,54 @@ public void execute() {
IntBuffer offsets = null, counts = null;
readHead = 0;
while (readHead < writeHead) {
int type = (int) cmd[readHead++];
// Casting from long to int keeps the lower 32 bits
long data = cmd[readHead++];
int type = (int) data & 0xFF;
switch (type) {
case UNIFORM_BASE_OFFSET: {
int x = (int) cmd[readHead++];
int y = (int) cmd[readHead++];
int z = (int) cmd[readHead++];
long packed = cmd[readHead++];
int x = (int) (data >> 32);
int y = (int) (packed >> 32);
int z = (int) packed;
if (uboCommandBuffer != null)
uboCommandBuffer.sceneBase.set(x, y, z);
break;
}
case UNIFORM_WORLD_VIEW_ID: {
int id = (int) cmd[readHead++];
int id = (int) (data >> 8);
if (uboCommandBuffer != null)
uboCommandBuffer.worldViewIndex.set(id);
break;
}
case GL_DEPTH_MASK_TYPE: {
int state = (int) cmd[readHead++];
int state = (int) (data >> 8) & 1;
if (SKIP_DEPTH_MASKING)
continue;
glDepthMask(state == 1);
break;
}
case GL_COLOR_MASK_TYPE: {
int red = (int) cmd[readHead++];
int green = (int) cmd[readHead++];
int blue = (int) cmd[readHead++];
int alpha = (int) cmd[readHead++];
glColorMask(red == 1, green == 1, blue == 1, alpha == 1);
boolean red = ((data >> 8) & 1) == 1;
boolean green = ((data >> 9) & 1) == 1;
boolean blue = ((data >> 10) & 1) == 1;
boolean alpha = ((data >> 11) & 1) == 1;
glColorMask(red, green, blue, alpha);
break;
}
case GL_BIND_VERTEX_ARRAY_TYPE: {
glBindVertexArray((int) cmd[readHead++]);
glBindVertexArray((int) (data >> 8));
break;
}
case GL_BIND_ELEMENTS_ARRAY_TYPE: {
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, (int) cmd[readHead++]);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, (int) (data >> 8));
break;
}
case GL_DRAW_ARRAYS_TYPE: {
int mode = (int) cmd[readHead++];
int offset = (int) cmd[readHead++];
int count = (int) cmd[readHead++];
long packed = cmd[readHead++];

int mode = (int) data >> 8;
int offset = (int) (packed >> 32);
int count = (int) packed;

if (uboCommandBuffer != null && uboCommandBuffer.isDirty())
uboCommandBuffer.upload();
Expand All @@ -181,8 +179,8 @@ public void execute() {
break;
}
case GL_DRAW_ELEMENTS_TYPE: {
int mode = (int) cmd[readHead++];
int vertexCount = (int) cmd[readHead++];
int mode = (int) data >> 8;
int vertexCount = (int) (data >> 32);
long byteOffset = cmd[readHead++];

if (uboCommandBuffer != null && uboCommandBuffer.isDirty())
Expand All @@ -192,17 +190,18 @@ public void execute() {
break;
}
case GL_MULTI_DRAW_ARRAYS_TYPE: {
int mode = (int) cmd[readHead++];
int drawCount = (int) cmd[readHead++];
int mode = (int) data >> 8;
int drawCount = (int) (data >> 32);

if (offsets == null || offsets.capacity() < drawCount) {
offsets = stack.callocInt(drawCount);
counts = stack.callocInt(drawCount);
}

for (int i = 0; i < drawCount; i++) {
offsets.put((int) cmd[readHead++]);
counts.put((int) cmd[readHead++]);
long packed = cmd[readHead++];
offsets.put((int) (packed >> 32));
counts.put((int) packed);
}

offsets.flip();
Expand All @@ -219,7 +218,7 @@ public void execute() {
}
case GL_TOGGLE_TYPE: {
long packed = cmd[readHead++];
int capability = (int) (packed & INT_MASK);
int capability = (int) packed;
if ((packed >> 32) != 0) {
glEnable(capability);
} else {
Expand Down