Skip to content

Commit 5587e17

Browse files
committed
fix build errors related to GpuBuffer interface extraction
1 parent ed6096e commit 5587e17

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

jme3-lwjgl3/src/main/java/com/jme3/vulkan/buffers/GpuBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ default void recordCopy(MemoryStack stack, CommandBuffer commands, GpuBuffer sou
116116
long srcOffset, long dstOffset, long size) {
117117
VkBufferCopy.Buffer copy = VkBufferCopy.calloc(1, stack)
118118
.srcOffset(srcOffset).dstOffset(dstOffset).size(size);
119-
vkCmdCopyBuffer(commands.getBuffer(), source.getNativeObject(), getNativeObject(), copy);
119+
vkCmdCopyBuffer(commands.getBuffer(), source.getId(), getId(), copy);
120120
}
121121

122122
}

jme3-lwjgl3/src/main/java/com/jme3/vulkan/images/VulkanImageLoader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.jme3.asset.*;
44
import com.jme3.util.BufferUtils;
55
import com.jme3.vulkan.buffers.BufferUsage;
6+
import com.jme3.vulkan.buffers.VulkanBuffer;
67
import com.jme3.vulkan.memory.MemoryFlag;
78
import com.jme3.vulkan.memory.MemorySize;
89
import com.jme3.vulkan.commands.CommandBuffer;
@@ -152,7 +153,7 @@ private void flipImage(byte[] img, int width, int height, int bpp) {
152153

153154
private GpuImage loadGpuImage(CommandPool transferPool, ImageData data) {
154155
try (MemoryStack stack = MemoryStack.stackPush()) {
155-
GpuBuffer staging = new GpuBuffer(transferPool.getDevice(), MemorySize.bytes(data.getBuffer().limit()),
156+
GpuBuffer staging = new VulkanBuffer(transferPool.getDevice(), MemorySize.bytes(data.getBuffer().limit()),
156157
BufferUsage.TransferSrc, Flag.of(MemoryFlag.HostVisible, MemoryFlag.HostCached), false);
157158
staging.copy(stack, data.getBuffer());
158159
GpuImage image = new GpuImage(transferPool.getDevice(), data.getWidth(), data.getHeight(), data.getFormat(),
@@ -171,7 +172,7 @@ private GpuImage loadGpuImage(CommandPool transferPool, ImageData data) {
171172
.layerCount(1);
172173
region.imageOffset().set(0, 0, 0);
173174
region.imageExtent().set(data.getWidth(), data.getHeight(), 1);
174-
vkCmdCopyBufferToImage(commands.getBuffer(), staging.getNativeObject(),
175+
vkCmdCopyBufferToImage(commands.getBuffer(), staging.getId(),
175176
image.getNativeObject(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, region);
176177
image.transitionLayout(commands, Image.Layout.TransferDstOptimal, Image.Layout.ShaderReadOnlyOptimal);
177178
commands.end();

jme3-lwjgl3/src/main/java/com/jme3/vulkan/material/uniforms/BufferUniform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public BufferUniform(String name, Descriptor type, int bindingIndex, Flag<Shader
3434
@Override
3535
public void populateWrite(MemoryStack stack, VkWriteDescriptorSet write) {
3636
VkDescriptorBufferInfo.Buffer info = VkDescriptorBufferInfo.calloc(1, stack)
37-
.buffer(buffer.getNativeObject())
37+
.buffer(buffer.getId())
3838
.offset(0L)
3939
.range(buffer.size().getBytes());
4040
write.pBufferInfo(info)

jme3-lwjgl3/src/main/java/com/jme3/vulkan/memory/MemoryRegion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public NativeReference getNativeReference() {
5959
}
6060

6161
public void bind(GpuBuffer buffer, long offset) {
62-
check(vkBindBufferMemory(device.getNativeObject(), buffer.getNativeObject(), id, offset),
62+
check(vkBindBufferMemory(device.getNativeObject(), buffer.getId(), id, offset),
6363
"Failed to bind buffer memory.");
6464
}
6565

0 commit comments

Comments
 (0)