-
Notifications
You must be signed in to change notification settings - Fork 28
/
Copy pathCh23TextureImage.diff
336 lines (315 loc) · 15 KB
/
Ch23TextureImage.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
diff --git "a/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch22DescriptorSets.java" "b/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch23TextureImage.java"
index 6173ec8..17a02f4 100644
--- "a/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch22DescriptorSets.java"
+++ "b/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch23TextureImage.java"
@@ -15,6 +15,7 @@ import java.util.*;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import static java.lang.ClassLoader.getSystemClassLoader;
import static java.util.stream.Collectors.toSet;
import static javavulkantutorial.AlignmentUtils.alignas;
import static javavulkantutorial.AlignmentUtils.alignof;
@@ -24,17 +25,17 @@ import static javavulkantutorial.ShaderSPIRVUtils.compileShaderFile;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.glfw.GLFWVulkan.glfwCreateWindowSurface;
import static org.lwjgl.glfw.GLFWVulkan.glfwGetRequiredInstanceExtensions;
+import static org.lwjgl.stb.STBImage.*;
import static org.lwjgl.system.Configuration.DEBUG;
import static org.lwjgl.system.MemoryStack.stackGet;
import static org.lwjgl.system.MemoryStack.stackPush;
import static org.lwjgl.system.MemoryUtil.NULL;
-import static org.lwjgl.system.MemoryUtil.memSet;
import static org.lwjgl.vulkan.EXTDebugUtils.*;
import static org.lwjgl.vulkan.KHRSurface.*;
import static org.lwjgl.vulkan.KHRSwapchain.*;
import static org.lwjgl.vulkan.VK10.*;
-public class Ch22DescriptorSets {
+public class Ch23TextureImage {
private static class HelloTriangleApplication {
@@ -224,6 +225,9 @@ public class Ch22DescriptorSets {
private long commandPool;
+ private long textureImage;
+ private long textureImageMemory;
+
private long vertexBuffer;
private long vertexBufferMemory;
private long indexBuffer;
@@ -287,6 +291,7 @@ public class Ch22DescriptorSets {
pickPhysicalDevice();
createLogicalDevice();
createCommandPool();
+ createTextureImage();
createVertexBuffer();
createIndexBuffer();
createDescriptorSetLayout();
@@ -331,6 +336,9 @@ public class Ch22DescriptorSets {
cleanupSwapChain();
+ vkDestroyImage(device, textureImage, null);
+ vkFreeMemory(device, textureImageMemory, null);
+
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, null);
vkDestroyBuffer(device, indexBuffer, null);
@@ -939,6 +947,193 @@ public class Ch22DescriptorSets {
}
}
+ private void createTextureImage() {
+
+ try(MemoryStack stack = stackPush()) {
+
+ String filename = getSystemClassLoader().getResource("textures/texture.jpg").toExternalForm();
+
+ IntBuffer pWidth = stack.mallocInt(1);
+ IntBuffer pHeight = stack.mallocInt(1);
+ IntBuffer pChannels = stack.mallocInt(1);
+
+ ByteBuffer pixels = stbi_load(filename, pWidth, pHeight, pChannels, STBI_rgb_alpha);
+
+ long imageSize = pWidth.get(0) * pHeight.get(0) * /*always 4 due to STBI_rgb_alpha*/pChannels.get(0);
+
+ if(pixels == null) {
+ throw new RuntimeException("Failed to load texture image " + filename);
+ }
+
+ LongBuffer pStagingBuffer = stack.mallocLong(1);
+ LongBuffer pStagingBufferMemory = stack.mallocLong(1);
+ createBuffer(imageSize,
+ VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+ pStagingBuffer,
+ pStagingBufferMemory);
+
+
+ PointerBuffer data = stack.mallocPointer(1);
+ vkMapMemory(device, pStagingBufferMemory.get(0), 0, imageSize, 0, data);
+ {
+ memcpy(data.getByteBuffer(0, (int) imageSize), pixels, imageSize);
+ }
+ vkUnmapMemory(device, pStagingBufferMemory.get(0));
+
+ stbi_image_free(pixels);
+
+ LongBuffer pTextureImage = stack.mallocLong(1);
+ LongBuffer pTextureImageMemory = stack.mallocLong(1);
+ createImage(pWidth.get(0), pHeight.get(0),
+ VK_FORMAT_R8G8B8A8_SRGB, VK_IMAGE_TILING_OPTIMAL,
+ VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+ VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+ pTextureImage,
+ pTextureImageMemory);
+
+ textureImage = pTextureImage.get(0);
+ textureImageMemory = pTextureImageMemory.get(0);
+
+ transitionImageLayout(textureImage,
+ VK_FORMAT_R8G8B8A8_SRGB,
+ VK_IMAGE_LAYOUT_UNDEFINED,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+
+ copyBufferToImage(pStagingBuffer.get(0), textureImage, pWidth.get(0), pHeight.get(0));
+
+ transitionImageLayout(textureImage,
+ VK_FORMAT_R8G8B8A8_SRGB,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+ VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+
+ vkDestroyBuffer(device, pStagingBuffer.get(0), null);
+ vkFreeMemory(device, pStagingBufferMemory.get(0), null);
+ }
+ }
+
+ private void createImage(int width, int height, int format, int tiling, int usage, int memProperties,
+ LongBuffer pTextureImage, LongBuffer pTextureImageMemory) {
+
+ try(MemoryStack stack = stackPush()) {
+
+ VkImageCreateInfo imageInfo = VkImageCreateInfo.calloc(stack);
+ imageInfo.sType(VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
+ imageInfo.imageType(VK_IMAGE_TYPE_2D);
+ imageInfo.extent().width(width);
+ imageInfo.extent().height(height);
+ imageInfo.extent().depth(1);
+ imageInfo.mipLevels(1);
+ imageInfo.arrayLayers(1);
+ imageInfo.format(format);
+ imageInfo.tiling(tiling);
+ imageInfo.initialLayout(VK_IMAGE_LAYOUT_UNDEFINED);
+ imageInfo.usage(usage);
+ imageInfo.samples(VK_SAMPLE_COUNT_1_BIT);
+ imageInfo.sharingMode(VK_SHARING_MODE_EXCLUSIVE);
+
+ if(vkCreateImage(device, imageInfo, null, pTextureImage) != VK_SUCCESS) {
+ throw new RuntimeException("Failed to create image");
+ }
+
+ VkMemoryRequirements memRequirements = VkMemoryRequirements.malloc(stack);
+ vkGetImageMemoryRequirements(device, pTextureImage.get(0), memRequirements);
+
+ VkMemoryAllocateInfo allocInfo = VkMemoryAllocateInfo.calloc(stack);
+ allocInfo.sType(VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO);
+ allocInfo.allocationSize(memRequirements.size());
+ allocInfo.memoryTypeIndex(findMemoryType(stack, memRequirements.memoryTypeBits(), memProperties));
+
+ if(vkAllocateMemory(device, allocInfo, null, pTextureImageMemory) != VK_SUCCESS) {
+ throw new RuntimeException("Failed to allocate image memory");
+ }
+
+ vkBindImageMemory(device, pTextureImage.get(0), pTextureImageMemory.get(0), 0);
+ }
+ }
+
+ private void transitionImageLayout(long image, int format, int oldLayout, int newLayout) {
+
+ try(MemoryStack stack = stackPush()) {
+
+ VkImageMemoryBarrier.Buffer barrier = VkImageMemoryBarrier.calloc(1, stack);
+ barrier.sType(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER);
+ barrier.oldLayout(oldLayout);
+ barrier.newLayout(newLayout);
+ barrier.srcQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED);
+ barrier.dstQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED);
+ barrier.image(image);
+ barrier.subresourceRange().aspectMask(VK_IMAGE_ASPECT_COLOR_BIT);
+ barrier.subresourceRange().baseMipLevel(0);
+ barrier.subresourceRange().levelCount(1);
+ barrier.subresourceRange().baseArrayLayer(0);
+ barrier.subresourceRange().layerCount(1);
+
+ int sourceStage;
+ int destinationStage;
+
+ if(oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
+
+ barrier.srcAccessMask(0);
+ barrier.dstAccessMask(VK_ACCESS_TRANSFER_WRITE_BIT);
+
+ sourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+ destinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+
+ } else if(oldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL && newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
+
+ barrier.srcAccessMask(VK_ACCESS_TRANSFER_WRITE_BIT);
+ barrier.dstAccessMask(VK_ACCESS_SHADER_READ_BIT);
+
+ sourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+ destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+
+ } else {
+ throw new IllegalArgumentException("Unsupported layout transition");
+ }
+
+ VkCommandBuffer commandBuffer = beginSingleTimeCommands();
+
+ vkCmdPipelineBarrier(commandBuffer,
+ sourceStage, destinationStage,
+ 0,
+ null,
+ null,
+ barrier);
+
+ endSingleTimeCommands(commandBuffer);
+ }
+ }
+
+ private void copyBufferToImage(long buffer, long image, int width, int height) {
+
+ try(MemoryStack stack = stackPush()) {
+
+ VkCommandBuffer commandBuffer = beginSingleTimeCommands();
+
+ VkBufferImageCopy.Buffer region = VkBufferImageCopy.calloc(1, stack);
+ region.bufferOffset(0);
+ region.bufferRowLength(0); // Tightly packed
+ region.bufferImageHeight(0); // Tightly packed
+ region.imageSubresource().aspectMask(VK_IMAGE_ASPECT_COLOR_BIT);
+ region.imageSubresource().mipLevel(0);
+ region.imageSubresource().baseArrayLayer(0);
+ region.imageSubresource().layerCount(1);
+ region.imageOffset().set(0, 0, 0);
+ region.imageExtent(VkExtent3D.calloc(stack).set(width, height, 1));
+
+ vkCmdCopyBufferToImage(commandBuffer, buffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, region);
+
+ endSingleTimeCommands(commandBuffer);
+ }
+ }
+
+ private void memcpy(ByteBuffer dst, ByteBuffer src, long size) {
+ src.limit((int)size);
+ dst.put(src);
+ src.limit(src.capacity()).rewind();
+ }
+
private void createVertexBuffer() {
try(MemoryStack stack = stackPush()) {
@@ -1135,7 +1330,7 @@ public class Ch22DescriptorSets {
VkMemoryRequirements memRequirements = VkMemoryRequirements.malloc(stack);
vkGetBufferMemoryRequirements(device, pBuffer.get(0), memRequirements);
- VkMemoryAllocateInfo allocInfo = VkMemoryAllocateInfo.calloc(stack);
+ VkMemoryAllocateInfo allocInfo = VkMemoryAllocateInfo.callocStack(stack);
allocInfo.sType(VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO);
allocInfo.allocationSize(memRequirements.size());
allocInfo.memoryTypeIndex(findMemoryType(stack, memRequirements.memoryTypeBits(), properties));
@@ -1148,11 +1343,11 @@ public class Ch22DescriptorSets {
}
}
- private void copyBuffer(long srcBuffer, long dstBuffer, long size) {
+ private VkCommandBuffer beginSingleTimeCommands() {
try(MemoryStack stack = stackPush()) {
- VkCommandBufferAllocateInfo allocInfo = VkCommandBufferAllocateInfo.calloc(stack);
+ VkCommandBufferAllocateInfo allocInfo = VkCommandBufferAllocateInfo.callocStack(stack);
allocInfo.sType(VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO);
allocInfo.level(VK_COMMAND_BUFFER_LEVEL_PRIMARY);
allocInfo.commandPool(commandPool);
@@ -1162,29 +1357,45 @@ public class Ch22DescriptorSets {
vkAllocateCommandBuffers(device, allocInfo, pCommandBuffer);
VkCommandBuffer commandBuffer = new VkCommandBuffer(pCommandBuffer.get(0), device);
- VkCommandBufferBeginInfo beginInfo = VkCommandBufferBeginInfo.calloc(stack);
+ VkCommandBufferBeginInfo beginInfo = VkCommandBufferBeginInfo.callocStack(stack);
beginInfo.sType(VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO);
beginInfo.flags(VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
vkBeginCommandBuffer(commandBuffer, beginInfo);
- {
- VkBufferCopy.Buffer copyRegion = VkBufferCopy.calloc(1, stack);
- copyRegion.size(size);
- vkCmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, copyRegion);
- }
+
+ return commandBuffer;
+ }
+ }
+
+ private void endSingleTimeCommands(VkCommandBuffer commandBuffer) {
+
+ try(MemoryStack stack = stackPush()) {
+
vkEndCommandBuffer(commandBuffer);
- VkSubmitInfo submitInfo = VkSubmitInfo.callocStack(stack);
+ VkSubmitInfo.Buffer submitInfo = VkSubmitInfo.callocStack(1, stack);
submitInfo.sType(VK_STRUCTURE_TYPE_SUBMIT_INFO);
- submitInfo.pCommandBuffers(pCommandBuffer);
-
- if(vkQueueSubmit(graphicsQueue, submitInfo, VK_NULL_HANDLE) != VK_SUCCESS) {
- throw new RuntimeException("Failed to submit copy command buffer");
- }
+ submitInfo.pCommandBuffers(stack.pointers(commandBuffer));
+ vkQueueSubmit(graphicsQueue, submitInfo, VK_NULL_HANDLE);
vkQueueWaitIdle(graphicsQueue);
- vkFreeCommandBuffers(device, commandPool, pCommandBuffer);
+ vkFreeCommandBuffers(device, commandPool, commandBuffer);
+ }
+ }
+
+ private void copyBuffer(long srcBuffer, long dstBuffer, long size) {
+
+ try(MemoryStack stack = stackPush()) {
+
+ VkCommandBuffer commandBuffer = beginSingleTimeCommands();
+
+ VkBufferCopy.Buffer copyRegion = VkBufferCopy.callocStack(1, stack);
+ copyRegion.size(size);
+
+ vkCmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, copyRegion);
+
+ endSingleTimeCommands(commandBuffer);
}
}