-
Notifications
You must be signed in to change notification settings - Fork 28
/
Copy pathCh21DescriptorLayout.diff
272 lines (227 loc) · 10.7 KB
/
Ch21DescriptorLayout.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
diff --git "a/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch20IndexBuffer.java" "b/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch21DescriptorLayout.java"
index c6d6636..a8b2fe0 100644
--- "a/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch20IndexBuffer.java"
+++ "b/G:\\Java-Dev\\Vulkan-Tutorial-Java\\src\\main\\java\\javavulkantutorial\\Ch21DescriptorLayout.java"
@@ -1,15 +1,13 @@
package javavulkantutorial;
import javavulkantutorial.ShaderSPIRVUtils.SPIRV;
-import org.joml.Vector2f;
-import org.joml.Vector2fc;
-import org.joml.Vector3f;
-import org.joml.Vector3fc;
+import org.joml.*;
import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack;
import org.lwjgl.system.Pointer;
import org.lwjgl.vulkan.*;
+import java.lang.Math;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.LongBuffer;
@@ -33,7 +31,7 @@ import static org.lwjgl.vulkan.KHRSurface.*;
import static org.lwjgl.vulkan.KHRSwapchain.*;
import static org.lwjgl.vulkan.VK10.*;
-public class Ch20IndexBuffer {
+public class Ch21DescriptorLayout {
private static class HelloTriangleApplication {
@@ -117,6 +115,21 @@ public class Ch20IndexBuffer {
}
+ private static class UniformBufferObject {
+
+ private static final int SIZEOF = 3 * 16 * Float.BYTES;
+
+ private Matrix4f model;
+ private Matrix4f view;
+ private Matrix4f proj;
+
+ public UniformBufferObject() {
+ model = new Matrix4f();
+ view = new Matrix4f();
+ proj = new Matrix4f();
+ }
+ }
+
private static class Vertex {
private static final int SIZEOF = (2 + 3) * Float.BYTES;
@@ -200,6 +213,7 @@ public class Ch20IndexBuffer {
private List<Long> swapChainFramebuffers;
private long renderPass;
+ private long descriptorSetLayout;
private long pipelineLayout;
private long graphicsPipeline;
@@ -207,10 +221,12 @@ public class Ch20IndexBuffer {
private long vertexBuffer;
private long vertexBufferMemory;
-
private long indexBuffer;
private long indexBufferMemory;
+ private List<Long> uniformBuffers;
+ private List<Long> uniformBuffersMemory;
+
private List<VkCommandBuffer> commandBuffers;
private List<Frame> inFlightFrames;
@@ -235,7 +251,6 @@ public class Ch20IndexBuffer {
}
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
- glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
String title = getClass().getEnclosingClass().getSimpleName();
@@ -269,6 +284,7 @@ public class Ch20IndexBuffer {
createCommandPool();
createVertexBuffer();
createIndexBuffer();
+ createDescriptorSetLayout();
createSwapChainObjects();
createSyncObjects();
}
@@ -286,6 +302,9 @@ public class Ch20IndexBuffer {
private void cleanupSwapChain() {
+ uniformBuffers.forEach(ubo -> vkDestroyBuffer(device, ubo, null));
+ uniformBuffersMemory.forEach(uboMemory -> vkFreeMemory(device, uboMemory, null));
+
swapChainFramebuffers.forEach(framebuffer -> vkDestroyFramebuffer(device, framebuffer, null));
try(MemoryStack stack = stackPush()) {vkFreeCommandBuffers(device, commandPool, asPointerBuffer(stack, commandBuffers));}
@@ -305,6 +324,8 @@ public class Ch20IndexBuffer {
cleanupSwapChain();
+ vkDestroyDescriptorSetLayout(device, descriptorSetLayout, null);
+
vkDestroyBuffer(device, indexBuffer, null);
vkFreeMemory(device, indexBufferMemory, null);
@@ -362,6 +383,7 @@ public class Ch20IndexBuffer {
createRenderPass();
createGraphicsPipeline();
createFramebuffers();
+ createUniformBuffers();
createCommandBuffers();
}
@@ -690,14 +712,38 @@ public class Ch20IndexBuffer {
}
}
+ private void createDescriptorSetLayout() {
+
+ try(MemoryStack stack = stackPush()) {
+
+ VkDescriptorSetLayoutBinding.Buffer uboLayoutBinding = VkDescriptorSetLayoutBinding.calloc(1, stack);
+ uboLayoutBinding.binding(0);
+ uboLayoutBinding.descriptorCount(1);
+ uboLayoutBinding.descriptorType(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+ uboLayoutBinding.pImmutableSamplers(null);
+ uboLayoutBinding.stageFlags(VK_SHADER_STAGE_VERTEX_BIT);
+
+ VkDescriptorSetLayoutCreateInfo layoutInfo = VkDescriptorSetLayoutCreateInfo.calloc(stack);
+ layoutInfo.sType(VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO);
+ layoutInfo.pBindings(uboLayoutBinding);
+
+ LongBuffer pDescriptorSetLayout = stack.mallocLong(1);
+
+ if(vkCreateDescriptorSetLayout(device, layoutInfo, null, pDescriptorSetLayout) != VK_SUCCESS) {
+ throw new RuntimeException("Failed to create descriptor set layout");
+ }
+ descriptorSetLayout = pDescriptorSetLayout.get(0);
+ }
+ }
+
private void createGraphicsPipeline() {
try(MemoryStack stack = stackPush()) {
// Let's compile the GLSL shaders into SPIR-V at runtime using the shaderc library
// Check ShaderSPIRVUtils class to see how it can be done
- SPIRV vertShaderSPIRV = compileShaderFile("shaders/17_shader_vertexbuffer.vert", VERTEX_SHADER);
- SPIRV fragShaderSPIRV = compileShaderFile("shaders/17_shader_vertexbuffer.frag", FRAGMENT_SHADER);
+ SPIRV vertShaderSPIRV = compileShaderFile("shaders/21_shader_ubo.vert", VERTEX_SHADER);
+ SPIRV fragShaderSPIRV = compileShaderFile("shaders/21_shader_ubo.frag", FRAGMENT_SHADER);
long vertShaderModule = createShaderModule(vertShaderSPIRV.bytecode());
long fragShaderModule = createShaderModule(fragShaderSPIRV.bytecode());
@@ -789,6 +835,7 @@ public class Ch20IndexBuffer {
VkPipelineLayoutCreateInfo pipelineLayoutInfo = VkPipelineLayoutCreateInfo.calloc(stack);
pipelineLayoutInfo.sType(VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO);
+ pipelineLayoutInfo.pSetLayouts(stack.longs(descriptorSetLayout));
LongBuffer pPipelineLayout = stack.longs(VK_NULL_HANDLE);
@@ -965,6 +1012,30 @@ public class Ch20IndexBuffer {
}
}
+ private void createUniformBuffers() {
+
+ try(MemoryStack stack = stackPush()) {
+
+ uniformBuffers = new ArrayList<>(swapChainImages.size());
+ uniformBuffersMemory = new ArrayList<>(swapChainImages.size());
+
+ LongBuffer pBuffer = stack.mallocLong(1);
+ LongBuffer pBufferMemory = stack.mallocLong(1);
+
+ for(int i = 0;i < swapChainImages.size();i++) {
+ createBuffer(UniformBufferObject.SIZEOF,
+ VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+ pBuffer,
+ pBufferMemory);
+
+ uniformBuffers.add(pBuffer.get(0));
+ uniformBuffersMemory.add(pBufferMemory.get(0));
+ }
+
+ }
+ }
+
private void createBuffer(long size, int usage, int properties, LongBuffer pBuffer, LongBuffer pBufferMemory) {
try(MemoryStack stack = stackPush()) {
@@ -1055,6 +1126,15 @@ public class Ch20IndexBuffer {
buffer.rewind();
}
+ private void memcpy(ByteBuffer buffer, UniformBufferObject ubo) {
+
+ final int mat4Size = 16 * Float.BYTES;
+
+ ubo.model.get(0, buffer);
+ ubo.view.get(mat4Size, buffer);
+ ubo.proj.get(mat4Size * 2, buffer);
+ }
+
private int findMemoryType(MemoryStack stack, int typeFilter, int properties) {
VkPhysicalDeviceMemoryProperties memProperties = VkPhysicalDeviceMemoryProperties.malloc(stack);
@@ -1152,10 +1232,10 @@ public class Ch20IndexBuffer {
try(MemoryStack stack = stackPush()) {
- VkSemaphoreCreateInfo semaphoreInfo = VkSemaphoreCreateInfo.calloc(stack);
+ VkSemaphoreCreateInfo semaphoreInfo = VkSemaphoreCreateInfo.callocStack(stack);
semaphoreInfo.sType(VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO);
- VkFenceCreateInfo fenceInfo = VkFenceCreateInfo.calloc(stack);
+ VkFenceCreateInfo fenceInfo = VkFenceCreateInfo.callocStack(stack);
fenceInfo.sType(VK_STRUCTURE_TYPE_FENCE_CREATE_INFO);
fenceInfo.flags(VK_FENCE_CREATE_SIGNALED_BIT);
@@ -1178,6 +1258,27 @@ public class Ch20IndexBuffer {
}
}
+ private void updateUniformBuffer(int currentImage) {
+
+ try(MemoryStack stack = stackPush()) {
+
+ UniformBufferObject ubo = new UniformBufferObject();
+
+ ubo.model.rotate((float) (glfwGetTime() * Math.toRadians(90)), 0.0f, 0.0f, 1.0f);
+ ubo.view.lookAt(2.0f, 2.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f);
+ ubo.proj.perspective((float) Math.toRadians(45),
+ (float)swapChainExtent.width() / (float)swapChainExtent.height(), 0.1f, 10.0f);
+ ubo.proj.m11(ubo.proj.m11() * -1);
+
+ PointerBuffer data = stack.mallocPointer(1);
+ vkMapMemory(device, uniformBuffersMemory.get(currentImage), 0, UniformBufferObject.SIZEOF, 0, data);
+ {
+ memcpy(data.getByteBuffer(0, UniformBufferObject.SIZEOF), ubo);
+ }
+ vkUnmapMemory(device, uniformBuffersMemory.get(currentImage));
+ }
+ }
+
private void drawFrame() {
try(MemoryStack stack = stackPush()) {
@@ -1200,13 +1301,15 @@ public class Ch20IndexBuffer {
final int imageIndex = pImageIndex.get(0);
+ updateUniformBuffer(imageIndex);
+
if(imagesInFlight.containsKey(imageIndex)) {
vkWaitForFences(device, imagesInFlight.get(imageIndex).fence(), true, UINT64_MAX);
}
imagesInFlight.put(imageIndex, thisFrame);
- VkSubmitInfo submitInfo = VkSubmitInfo.calloc(stack);
+ VkSubmitInfo submitInfo = VkSubmitInfo.callocStack(stack);
submitInfo.sType(VK_STRUCTURE_TYPE_SUBMIT_INFO);
submitInfo.waitSemaphoreCount(1);