halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

SOMTHING

pull/12/head
hYdos 2020-03-03 20:46:52 +10:00
parent 49d3298bda
commit f37ae287df
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/github/hydos/ginger/engine/vulkan/model/VKModelData.java
View File

@ -22,8 +22,8 @@ public class VKModelData
public void loadModel() { public void loadModel() {
this.mesh = ModelLoader.getCubeMesh(); this.mesh = ModelLoader.getCubeMesh();
createIndexBuffer();
createVertexBuffer(); createVertexBuffer();
createIndexBuffer();
} }
public int findMemoryType(int typeFilter, int properties) { public int findMemoryType(int typeFilter, int properties) {
@ -159,7 +159,7 @@ public class VKModelData
try(MemoryStack stack = stackPush()) { try(MemoryStack stack = stackPush()) {
long bufferSize = 3 * mesh.getVertices().length; long bufferSize = ((3 + 3 + 2) * Float.BYTES) * mesh.getVertices().length;
LongBuffer pBuffer = stack.mallocLong(1); LongBuffer pBuffer = stack.mallocLong(1);
LongBuffer pBufferMemory = stack.mallocLong(1); LongBuffer pBufferMemory = stack.mallocLong(1);
@ -195,7 +195,16 @@ public class VKModelData
VK12.vkFreeMemory(VKRegister.device, stagingBufferMemory, null); VK12.vkFreeMemory(VKRegister.device, stagingBufferMemory, null);
} }
} }
private void memcpyIndices(ByteBuffer buffer, int[] indices) {
for(int index : indices) {
buffer.putInt(index);
}
buffer.rewind();
}
private void createIndexBuffer() { private void createIndexBuffer() {
try(MemoryStack stack = stackPush()) { try(MemoryStack stack = stackPush()) {
@ -217,13 +226,13 @@ public class VKModelData
VK12.vkMapMemory(VKRegister.device, stagingBufferMemory, 0, bufferSize, 0, data); VK12.vkMapMemory(VKRegister.device, stagingBufferMemory, 0, bufferSize, 0, data);
{ {
memcpy(data.getByteBuffer(0, (int) bufferSize), mesh.getIndices()); memcpyIndices(data.getByteBuffer(0, (int) bufferSize), mesh.getIndices());
} }
VK12.vkUnmapMemory(VKRegister.device, stagingBufferMemory); VK12.vkUnmapMemory(VKRegister.device, stagingBufferMemory);
createBuffer(bufferSize, createBuffer(bufferSize,
VK12.VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK12.VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK12.VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK12.VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
VK12.VK_MEMORY_HEAP_DEVICE_LOCAL_BIT, VK12.VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
pBuffer, pBuffer,
pBufferMemory); pBufferMemory);