annotate tests/test_rendering.nim @ 1277:01138e6257dd

did: fix a few things
author sam <sam@basx.dev>
date Mon, 29 Jul 2024 15:04:52 +0700
parents 4cf9872f7bb6
children a89a70ea3da2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1233
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
1 import std/os
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
2 import std/sequtils
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
3 import std/monotimes
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
4 import std/times
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
5 import std/options
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
6 import std/random
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
7
1267
4cf9872f7bb6 did: rename back to old name (no v2)
sam <sam@basx.dev>
parents: 1252
diff changeset
8 import ../semicongine
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
9
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
10 proc test_01_triangle(time: float32) =
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
11 var renderdata = InitRenderData()
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
12
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
13 type
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
14 PushConstant = object
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
15 scale: float32
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
16 Shader = object
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
17 position {.VertexAttribute.}: Vec3f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
18 color {.VertexAttribute.}: Vec3f
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
19 pushConstant {.PushConstantAttribute.}: PushConstant
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
20 fragmentColor {.Pass.}: Vec3f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
21 outColor {.ShaderOutput.}: Vec4f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
22 # code
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
23 vertexCode: string = """void main() {
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
24 fragmentColor = color;
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
25 gl_Position = vec4(position * pushConstant.scale, 1);}"""
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
26 fragmentCode: string = """void main() {
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
27 outColor = vec4(fragmentColor, 1);}"""
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
28 TriangleMesh = object
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
29 position: GPUArray[Vec3f, VertexBuffer]
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
30 color: GPUArray[Vec3f, VertexBuffer]
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
31 var mesh = TriangleMesh(
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
32 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(0, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
33 color: asGPUArray([NewVec3f(0, 0, 1), NewVec3f(0, 1, 0), NewVec3f(1, 0, 0)], VertexBuffer),
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
34 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
35 AssignBuffers(renderdata, mesh)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
36 renderdata.FlushAllMemory()
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
37
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
38 var pipeline = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass)
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
39
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
40 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
41 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
42
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
43 WithNextFrame(framebuffer, commandbuffer):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
44
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
45 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
46
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
47 WithPipeline(commandbuffer, pipeline):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
48
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
49 RenderWithPushConstant(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh, pushConstant = PushConstant(scale: 0.3 + ((getMonoTime() - start).inMilliseconds().int / 1000)))
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
50
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
51 # cleanup
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
52 checkVkResult vkDeviceWaitIdle(vulkan.device)
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
53 DestroyPipeline(pipeline)
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
54 DestroyRenderData(renderdata)
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
55
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
56
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
57 proc test_02_triangle_quad_instanced(time: float32) =
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
58 var renderdata = InitRenderData()
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
59
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
60 type
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
61 SomeShader = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
62 position {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
63 color {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
64 pos {.InstanceAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
65 scale {.InstanceAttribute.}: float32
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
66 fragmentColor {.Pass.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
67 outColor {.ShaderOutput.}: Vec4f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
68 # code
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
69 vertexCode: string = """void main() {
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
70 fragmentColor = color;
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
71 gl_Position = vec4((position * scale) + pos, 1);}"""
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
72 fragmentCode: string = """void main() {
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
73 outColor = vec4(fragmentColor, 1);}"""
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
74 TriangleMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
75 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
76 color: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
77 QuadMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
78 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
79 color: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
80 indices: GPUArray[uint16, IndexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
81 Instances = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
82 pos: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
83 scale: GPUArray[float32, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
84 var tri = TriangleMesh(
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
85 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(0, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
86 color: asGPUArray([NewVec3f(0, 0, 1), NewVec3f(0, 1, 0), NewVec3f(1, 0, 0)], VertexBuffer),
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
87 )
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
88 var quad = QuadMesh(
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
89 position: asGPUArray([NewVec3f(-0.3, -0.3), NewVec3f(-0.3, 0.3), NewVec3f(0.3, 0.3), NewVec3f(0.3, -0.3)], VertexBuffer),
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
90 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
91 color: asGPUArray([NewVec3f(1, 1, 1), NewVec3f(1, 1, 1), NewVec3f(1, 1, 1), NewVec3f(1, 1, 1)], VertexBuffer),
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
92 )
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
93
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
94 var instancesA: Instances
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
95 for n in 1..100:
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
96 instancesA.pos.data.add NewVec3f(rand(-0.8'f32 .. 0.8'f32), rand(-0.8'f32 .. 0'f32))
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
97 instancesA.scale.data.add rand(0.3'f32 .. 0.4'f32)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
98 var instancesB: Instances
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
99 for n in 1..100:
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
100 instancesB.pos.data.add NewVec3f(rand(-0.8'f32 .. 0.8'f32), rand(0'f32 .. 0.8'f32))
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
101 instancesB.scale.data.add rand(0.1'f32 .. 0.2'f32)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
102
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
103 AssignBuffers(renderdata, tri)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
104 AssignBuffers(renderdata, quad)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
105 AssignBuffers(renderdata, instancesA)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
106 AssignBuffers(renderdata, instancesB)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
107 renderdata.FlushAllMemory()
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
108
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
109 var pipeline = CreatePipeline[SomeShader](renderPass = vulkan.swapchain.renderPass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
110
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
111 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
112 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
113
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
114 WithNextFrame(framebuffer, commandbuffer):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
115
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
116 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
117
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
118 WithPipeline(commandbuffer, pipeline):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
119
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
120 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad, instances = instancesA)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
121 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad, instances = instancesB)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
122 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = tri, instances = instancesA)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
123 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = tri, instances = instancesB)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
124
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
125 # cleanup
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
126 checkVkResult vkDeviceWaitIdle(vulkan.device)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
127 DestroyPipeline(pipeline)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
128 DestroyRenderData(renderdata)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
129
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
130 proc test_03_simple_descriptorset(time: float32) =
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
131 var renderdata = InitRenderData()
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
132
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
133 type
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
134 Material = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
135 baseColor: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
136
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
137 Uniforms = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
138 material: GPUValue[Material, UniformBuffer]
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
139 texture1: Image[BGRA]
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
140
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
141 QuadShader = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
142 position {.VertexAttribute.}: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
143 fragmentColor {.Pass.}: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
144 uv {.Pass.}: Vec2f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
145 outColor {.ShaderOutput.}: Vec4f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
146 descriptorSets {.DescriptorSets.}: (Uniforms, )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
147 # code
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
148 vertexCode: string = """void main() {
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
149 fragmentColor = material.baseColor;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
150 gl_Position = vec4(position, 1);
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
151 gl_Position.x += ((material.baseColor.b - 0.5) * 2) - 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
152 uv = position.xy + 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
153 }"""
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
154 fragmentCode: string = """void main() {
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
155 outColor = vec4(fragmentColor, 1) * texture(texture1, uv);}"""
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
156 QuadMesh = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
157 position: GPUArray[Vec3f, VertexBuffer]
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
158 indices: GPUArray[uint16, IndexBuffer]
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
159
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
160 let R = BGRA([255'u8, 0'u8, 0'u8, 255'u8])
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
161 let G = BGRA([0'u8, 255'u8, 0'u8, 255'u8])
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
162 let B = BGRA([0'u8, 0'u8, 255'u8, 255'u8])
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
163 let W = BGRA([255'u8, 255'u8, 255'u8, 255'u8])
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
164 var
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
165 quad = QuadMesh(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
166 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(-0.5, 0.5), NewVec3f(0.5, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
167 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
168 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
169 uniforms1 = asDescriptorSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
170 Uniforms(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
171 material: asGPUValue(Material(baseColor: NewVec3f(1, 1, 1)), UniformBuffer),
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
172 texture1: Image[BGRA](width: 3, height: 3, data: @[R, G, B, G, B, R, B, R, G], minInterpolation: VK_FILTER_NEAREST, magInterpolation: VK_FILTER_NEAREST),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
173 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
174 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
175 uniforms2 = asDescriptorSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
176 Uniforms(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
177 material: asGPUValue(Material(baseColor: NewVec3f(0.5, 0.5, 0.5)), UniformBuffer),
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
178 texture1: Image[BGRA](width: 2, height: 2, data: @[R, G, B, W]),
1212
518a952eccbf did: increase texture format compatability
sam <sam@basx.dev>
parents: 1211
diff changeset
179 )
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
180 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
181
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
182 AssignBuffers(renderdata, quad)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
183 AssignBuffers(renderdata, uniforms1)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
184 AssignBuffers(renderdata, uniforms2)
1228
4e465583ea32 did: rename texture to image
sam <sam@basx.dev>
parents: 1223
diff changeset
185 UploadImages(renderdata, uniforms1)
4e465583ea32 did: rename texture to image
sam <sam@basx.dev>
parents: 1223
diff changeset
186 UploadImages(renderdata, uniforms2)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
187 renderdata.FlushAllMemory()
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
188
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
189 var pipeline = CreatePipeline[QuadShader](renderPass = vulkan.swapchain.renderPass)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
190
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
191 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
192 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms2)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
193
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
194 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
195 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
196
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
197 WithNextFrame(framebuffer, commandbuffer):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
198
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
199 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
200
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
201 WithPipeline(commandbuffer, pipeline):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
202
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
203 WithBind(commandbuffer, (uniforms1, ), pipeline):
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
204 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
205
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
206 WithBind(commandbuffer, (uniforms2, ), pipeline):
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
207 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
208
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
209 # cleanup
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
210 checkVkResult vkDeviceWaitIdle(vulkan.device)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
211 DestroyPipeline(pipeline)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
212 DestroyRenderData(renderdata)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
213
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
214 proc test_04_multiple_descriptorsets(time: float32) =
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
215 var renderdata = InitRenderData()
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
216
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
217 type
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
218 RenderSettings = object
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
219 brigthness: float32
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
220 Material = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
221 baseColor: Vec3f
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
222 ObjectSettings = object
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
223 scale: float32
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
224 materialIndex: uint32
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
225 Constants = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
226 offset: Vec2f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
227
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
228 ConstSet = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
229 constants: GPUValue[Constants, UniformBuffer]
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
230 MainSet = object
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
231 renderSettings: GPUValue[RenderSettings, UniformBufferMapped]
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
232 material: array[2, GPUValue[Material, UniformBuffer]]
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
233 texture1: array[2, Image[Gray]]
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
234 OtherSet = object
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
235 objectSettings: GPUValue[ObjectSettings, UniformBufferMapped]
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
236
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
237 QuadShader = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
238 position {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
239 fragmentColor {.Pass.}: Vec3f
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
240 uv {.Pass.}: Vec2f
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
241 outColor {.ShaderOutput.}: Vec4f
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
242 descriptorSets {.DescriptorSets.}: (ConstSet, MainSet, OtherSet)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
243 # code
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
244 vertexCode: string = """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
245 fragmentColor = material[objectSettings.materialIndex].baseColor * renderSettings.brigthness;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
246 gl_Position = vec4(position * objectSettings.scale, 1);
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
247 gl_Position.xy += constants.offset.xy;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
248 gl_Position.x += material[objectSettings.materialIndex].baseColor.b - 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
249 uv = position.xy + 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
250 }"""
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
251 fragmentCode: string = """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
252 outColor = vec4(fragmentColor * texture(texture1[objectSettings.materialIndex], uv).rrr, 1);
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
253 }"""
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
254 QuadMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
255 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
256 indices: GPUArray[uint16, IndexBuffer]
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
257
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
258 var quad = QuadMesh(
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
259 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(-0.5, 0.5), NewVec3f(0.5, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
260 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
261 )
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
262 var constset = asDescriptorSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
263 ConstSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
264 constants: asGPUValue(Constants(offset: NewVec2f(-0.3, 0.2)), UniformBuffer),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
265 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
266 )
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
267 let G = Gray([50'u8])
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
268 let W = Gray([255'u8])
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
269 var mainset = asDescriptorSet(
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
270 MainSet(
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
271 renderSettings: asGPUValue(RenderSettings(brigthness: 0), UniformBufferMapped),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
272 material: [
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
273 asGPUValue(Material(baseColor: NewVec3f(1, 1, 0)), UniformBuffer),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
274 asGPUValue(Material(baseColor: NewVec3f(1, 0, 1)), UniformBuffer),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
275 ],
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
276 texture1: [
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
277 Image[Gray](width: 2, height: 2, data: @[W, G, G, W], minInterpolation: VK_FILTER_NEAREST, magInterpolation: VK_FILTER_NEAREST),
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
278 Image[Gray](width: 3, height: 3, data: @[W, G, W, G, W, G, W, G, W], minInterpolation: VK_FILTER_NEAREST, magInterpolation: VK_FILTER_NEAREST),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
279 ],
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
280 ),
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
281 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
282 var otherset1 = asDescriptorSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
283 OtherSet(
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
284 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 0), UniformBufferMapped),
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
285 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
286 )
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
287 var otherset2 = asDescriptorSet(
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
288 OtherSet(
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
289 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 1), UniformBufferMapped),
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
290 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
291 )
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
292
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
293 AssignBuffers(renderdata, quad)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
294 AssignBuffers(renderdata, constset)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
295 AssignBuffers(renderdata, mainset)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
296 AssignBuffers(renderdata, otherset1)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
297 AssignBuffers(renderdata, otherset2)
1228
4e465583ea32 did: rename texture to image
sam <sam@basx.dev>
parents: 1223
diff changeset
298 UploadImages(renderdata, mainset)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
299 renderdata.FlushAllMemory()
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
300
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
301 var pipeline = CreatePipeline[QuadShader](renderPass = vulkan.swapchain.renderPass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
302
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
303 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], constset)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
304 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[1], mainset)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
305 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[2], otherset1)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
306 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[2], otherset2)
1205
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test
sam <sam@basx.dev>
parents: 1204
diff changeset
307
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
308 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
309 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
310
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
311 WithNextFrame(framebuffer, commandbuffer):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
312
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
313 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
314
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
315 WithPipeline(commandbuffer, pipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
316
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
317 WithBind(commandbuffer, (constset, mainset, otherset1), pipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
318 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
319
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
320 WithBind(commandbuffer, (constset, mainset, otherset2), pipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
321 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
322
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
323 mainset.data.renderSettings.data.brigthness = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
324 otherset1.data.objectSettings.data.scale = 0.5 + ((getMonoTime() - start).inMilliseconds().int / 1000) / time
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
325 UpdateGPUBuffer(mainset.data.renderSettings)
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
326 UpdateGPUBuffer(otherset1.data.objectSettings)
1205
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test
sam <sam@basx.dev>
parents: 1204
diff changeset
327 renderdata.FlushAllMemory()
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
328
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
329 # cleanup
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
330 checkVkResult vkDeviceWaitIdle(vulkan.device)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
331 DestroyPipeline(pipeline)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
332 DestroyRenderData(renderdata)
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
333
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
334 proc test_05_cube(time: float32) =
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
335 type
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
336
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
337 UniformData = object
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
338 mvp: Mat4
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
339 Uniforms = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
340 data: GPUValue[UniformData, UniformBufferMapped]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
341 CubeShader = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
342 position {.VertexAttribute.}: Vec3f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
343 color {.VertexAttribute.}: Vec4f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
344 fragmentColor {.Pass.}: Vec4f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
345 outColor {.ShaderOutput.}: Vec4f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
346 descriptorSets {.DescriptorSets.}: (Uniforms, )
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
347 # code
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
348 vertexCode = """void main() {
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
349 fragmentColor = color;
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
350 gl_Position = vec4(position, 1) * data.mvp;
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
351 }"""
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
352 fragmentCode = """void main() {
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
353 outColor = fragmentColor;
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
354 }"""
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
355 Mesh = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
356 position: GPUArray[Vec3f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
357 normals: GPUArray[Vec3f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
358 color: GPUArray[Vec4f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
359
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
360 let quad = @[
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
361 NewVec3f(-0.5, -0.5), NewVec3f(-0.5, +0.5), NewVec3f(+0.5, +0.5),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
362 NewVec3f(+0.5, +0.5), NewVec3f(+0.5, -0.5), NewVec3f(-0.5, -0.5),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
363 ]
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
364 proc transf(data: seq[Vec3f], mat: Mat4): seq[Vec3f] =
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
365 for v in data:
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
366 result.add mat * v
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
367
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
368 var
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
369 vertices: seq[Vec3f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
370 colors: seq[Vec4f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
371 normals: seq[Vec3f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
372
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
373 # front, red
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
374 vertices.add quad.transf(Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
375 colors.add newSeqWith(6, NewVec4f(1, 0, 0, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
376 normals.add newSeqWith(6, NewVec3f(0, 0, -1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
377
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
378 # back, cyan
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
379 vertices.add quad.transf(Rotate(PI, Y) * Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
380 colors.add newSeqWith(6, NewVec4f(0, 1, 1, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
381 normals.add newSeqWith(6, NewVec3f(0, 0, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
382
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
383 # right, green
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
384 vertices.add quad.transf(Rotate(PI / 2, Y) * Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
385 colors.add newSeqWith(6, NewVec4f(0, 1, 0, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
386 normals.add newSeqWith(6, NewVec3f(-1, 0, 0))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
387
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
388 # left, magenta
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
389 vertices.add quad.transf(Rotate(-PI / 2, Y) * Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
390 colors.add newSeqWith(6, NewVec4f(1, 0, 1, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
391 normals.add newSeqWith(6, NewVec3f(1, 0, 0))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
392
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
393 # bottom, blue
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
394 vertices.add quad.transf(Rotate(PI / 2, X) * Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
395 colors.add newSeqWith(6, NewVec4f(0, 0, 1, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
396 normals.add newSeqWith(6, NewVec3f(0, -1, 0))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
397
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
398 # top, yellow
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
399 vertices.add quad.transf(Rotate(-PI / 2, X) * Translate(0, 0, -0.5))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
400 colors.add newSeqWith(6, NewVec4f(1, 1, 0, 1))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
401 normals.add newSeqWith(6, NewVec3f(0, 1, 0))
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
402
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
403 var renderdata = InitRenderData()
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
404
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
405 var mesh = Mesh(
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
406 position: asGPUArray(vertices, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
407 color: asGPUArray(colors, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
408 normals: asGPUArray(normals, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
409 )
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
410 AssignBuffers(renderdata, mesh)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
411
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
412 var floor = Mesh(
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
413 position: asGPUArray(quad.transf(Scale(10, 10, 10) * Rotate(-PI / 2, X) * Translate(0, 0, 0.05)), VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
414 color: asGPUArray(newSeqWith(6, NewVec4f(0.1, 0.1, 0.1, 1)), VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
415 normals: asGPUArray(newSeqWith(6, Y), VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
416 )
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
417 AssignBuffers(renderdata, floor)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
418
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
419 var uniforms1 = asDescriptorSet(
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
420 Uniforms(
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
421 data: asGPUValue(UniformData(mvp: Unit4), UniformBufferMapped)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
422 )
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
423 )
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
424 AssignBuffers(renderdata, uniforms1)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
425
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
426 renderdata.FlushAllMemory()
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
427
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
428 var pipeline = CreatePipeline[CubeShader](renderPass = vulkan.swapchain.renderPass)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
429 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
430
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
431 var tStart = getMonoTime()
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
432 var t = tStart
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
433
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
434 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
435 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1233
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
436 let tStartLoop = getMonoTime() - tStart
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
437
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
438 uniforms1.data.data.data.mvp = (
1277
01138e6257dd did: fix a few things
sam <sam@basx.dev>
parents: 1267
diff changeset
439 Projection(-PI / 2, GetAspectRatio(), 0.01, 100) *
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
440 Translate(0, 0, 2) *
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
441 Rotate(PI / 4, X) *
1233
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
442 Rotate(PI * 0.1 * (tStartLoop.inMicroseconds() / 1_000_000), Y)
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
443 )
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
444 UpdateGPUBuffer(uniforms1.data.data, flush = true)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
445
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
446 WithNextFrame(framebuffer, commandbuffer):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
447
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
448 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
449 WithPipeline(commandbuffer, pipeline):
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
450
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
451 WithBind(commandbuffer, (uniforms1, ), pipeline):
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
452 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
453 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = floor)
1233
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
454
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
455 let tEndLoop = getMonoTime() - tStart
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
456 let looptime = tEndLoop - tStartLoop
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
457 let waitTime = 16_666 - looptime.inMicroseconds
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
458 if waitTime > 0:
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
459 sleep((waitTime / 1000).int)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
460
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
461 # cleanup
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
462 checkVkResult vkDeviceWaitIdle(vulkan.device)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
463 DestroyPipeline(pipeline)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
464 DestroyRenderData(renderdata)
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
465
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
466 proc test_06_different_draw_modes(time: float32) =
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
467 var renderdata = InitRenderData()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
468
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
469 type
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
470 Shader = object
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
471 position {.VertexAttribute.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
472 color {.VertexAttribute.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
473 fragmentColor {.Pass.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
474 outColor {.ShaderOutput.}: Vec4f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
475 # code
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
476 vertexCode: string = """void main() {
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
477 gl_PointSize = 100;
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
478 fragmentColor = color;
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
479 gl_Position = vec4(position, 1);}"""
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
480 fragmentCode: string = """void main() {
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
481 outColor = vec4(fragmentColor, 1);}"""
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
482 TriangleMesh = object
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
483 position: GPUArray[Vec3f, VertexBuffer]
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
484 color: GPUArray[Vec3f, VertexBuffer]
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
485 var triangle = TriangleMesh(
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
486 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(0, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
487 color: asGPUArray([NewVec3f(0, 0, 1), NewVec3f(0, 1, 0), NewVec3f(1, 0, 0)], VertexBuffer),
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
488 )
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
489 var lines = TriangleMesh(
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
490 position: asGPUArray([NewVec3f(-0.9, 0), NewVec3f(-0.05, -0.9), NewVec3f(0.05, -0.9), NewVec3f(0.9, 0)], VertexBuffer),
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
491 color: asGPUArray([NewVec3f(1, 1, 0), NewVec3f(1, 1, 0), NewVec3f(0, 1, 0), NewVec3f(0, 1, 0)], VertexBuffer),
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
492 )
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
493 AssignBuffers(renderdata, triangle)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
494 AssignBuffers(renderdata, lines)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
495 renderdata.FlushAllMemory()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
496
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
497 var pipeline1 = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass, polygonMode = VK_POLYGON_MODE_LINE, lineWidth = 20'f32)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
498 var pipeline2 = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass, polygonMode = VK_POLYGON_MODE_POINT)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
499 var pipeline3 = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass, topology = VK_PRIMITIVE_TOPOLOGY_LINE_LIST, lineWidth = 5)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
500 var pipeline4 = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass, topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
501
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
502 var start = getMonoTime()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
503 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
504 WithNextFrame(framebuffer, commandbuffer):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
505 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
506 WithPipeline(commandbuffer, pipeline1):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
507 Render(commandbuffer = commandbuffer, pipeline = pipeline1, mesh = triangle)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
508 WithPipeline(commandbuffer, pipeline2):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
509 Render(commandbuffer = commandbuffer, pipeline = pipeline2, mesh = triangle)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
510 WithPipeline(commandbuffer, pipeline3):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
511 Render(commandbuffer = commandbuffer, pipeline = pipeline3, mesh = lines)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
512 WithPipeline(commandbuffer, pipeline4):
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
513 Render(commandbuffer = commandbuffer, pipeline = pipeline4, mesh = lines)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
514
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
515 # cleanup
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
516 checkVkResult vkDeviceWaitIdle(vulkan.device)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
517 DestroyPipeline(pipeline1)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
518 DestroyPipeline(pipeline2)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
519 DestroyPipeline(pipeline3)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
520 DestroyPipeline(pipeline4)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
521 DestroyRenderData(renderdata)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
522
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
523 proc test_07_png_texture(time: float32) =
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
524 var renderdata = InitRenderData()
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
525
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
526 type
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
527 Uniforms = object
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
528 texture1: Image[BGRA]
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
529 Shader = object
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
530 position {.VertexAttribute.}: Vec3f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
531 uv {.VertexAttribute.}: Vec2f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
532 fragmentUv {.Pass.}: Vec2f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
533 outColor {.ShaderOutput.}: Vec4f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
534 descriptorSets {.DescriptorSets.}: (Uniforms, )
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
535 # code
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
536 vertexCode: string = """
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
537 void main() {
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
538 fragmentUv = uv;
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
539 gl_Position = vec4(position, 1);
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
540 }"""
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
541 fragmentCode: string = """
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
542 void main() {
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
543 outColor = texture(texture1, fragmentUv);
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
544 }"""
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
545 Quad = object
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
546 position: GPUArray[Vec3f, VertexBuffer]
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
547 uv: GPUArray[Vec2f, VertexBuffer]
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
548 var mesh = Quad(
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
549 position: asGPUArray([
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
550 NewVec3f(-0.8, -0.5), NewVec3f(-0.8, 0.5), NewVec3f(0.8, 0.5),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
551 NewVec3f(0.8, 0.5), NewVec3f(0.8, -0.5), NewVec3f(-0.8, -0.5),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
552 ], VertexBuffer),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
553 uv: asGPUArray([
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
554 NewVec2f(0, 1), NewVec2f(0, 0), NewVec2f(1, 0),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
555 NewVec2f(1, 0), NewVec2f(1, 1), NewVec2f(0, 1),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
556 ], VertexBuffer),
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
557 )
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
558 AssignBuffers(renderdata, mesh)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
559 renderdata.FlushAllMemory()
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
560
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
561 var pipeline = CreatePipeline[Shader](renderPass = vulkan.swapchain.renderPass)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
562 var uniforms1 = asDescriptorSet(
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
563 Uniforms(
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
564 texture1: LoadImage[BGRA]("art.png"),
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
565 )
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
566 )
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
567 UploadImages(renderdata, uniforms1)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
568 InitDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
569
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
570 var start = getMonoTime()
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
571 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
572
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
573 WithNextFrame(framebuffer, commandbuffer):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
574
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
575 WithRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
576
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
577 WithPipeline(commandbuffer, pipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
578
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
579 WithBind(commandbuffer, (uniforms1, ), pipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
580 Render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
581
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
582 # cleanup
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
583 checkVkResult vkDeviceWaitIdle(vulkan.device)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
584 DestroyPipeline(pipeline)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
585 DestroyRenderData(renderdata)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
586
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
587 proc test_08_triangle_2pass(time: float32, depthBuffer: bool, samples: VkSampleCountFlagBits) =
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
588 var (offscreenRP, presentRP) = CreateIndirectPresentationRenderPass(depthBuffer = depthBuffer, samples = samples)
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
589
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
590 SetupSwapchain(renderpass = presentRP)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
591
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
592 var renderdata = InitRenderData()
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
593
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
594 type
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
595 Uniforms = object
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
596 frameTexture: Image[BGRA]
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
597 TriangleShader = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
598 position {.VertexAttribute.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
599 color {.VertexAttribute.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
600 fragmentColor {.Pass.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
601 outColor {.ShaderOutput.}: Vec4f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
602 # code
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
603 vertexCode: string = """void main() {
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
604 fragmentColor = color;
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
605 gl_Position = vec4(position, 1);}"""
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
606 fragmentCode: string = """void main() {
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
607 outColor = vec4(fragmentColor, 1);}"""
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
608 PresentShader = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
609 position {.VertexAttribute.}: Vec2f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
610 uv {.Pass.}: Vec2f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
611 outColor {.ShaderOutput.}: Vec4f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
612 descriptorSets {.DescriptorSets.}: (Uniforms, )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
613 # code
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
614 vertexCode: string = """void main() {
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
615 uv = ((position + 1) * 0.5) * vec2(1, -1);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
616 gl_Position = vec4(position, 0, 1);}"""
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
617 fragmentCode: string = """void main() {
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
618 vec2 uv1 = uv + vec2(0.001, 0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
619 vec2 uv2 = uv + vec2(0.001, -0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
620 vec2 uv3 = uv + vec2(-0.001, 0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
621 vec2 uv4 = uv + vec2(-0.001, -0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
622 outColor = (
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
623 texture(frameTexture, uv1) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
624 texture(frameTexture, uv2) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
625 texture(frameTexture, uv3) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
626 texture(frameTexture, uv4)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
627 ) / 4;
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
628 }"""
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
629 TriangleMesh = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
630 position: GPUArray[Vec3f, VertexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
631 color: GPUArray[Vec3f, VertexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
632 QuadMesh = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
633 position: GPUArray[Vec2f, VertexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
634 indices: GPUArray[uint16, IndexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
635 var mesh = TriangleMesh(
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
636 position: asGPUArray([NewVec3f(-0.5, -0.5), NewVec3f(0, 0.5), NewVec3f(0.5, -0.5)], VertexBuffer),
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
637 color: asGPUArray([NewVec3f(0, 0, 1), NewVec3f(0, 1, 0), NewVec3f(1, 0, 0)], VertexBuffer),
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
638 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
639 var quad = QuadMesh(
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
640 position: asGPUArray([NewVec2f(-1, -1), NewVec2f(-1, 1), NewVec2f(1, 1), NewVec2f(1, -1)], VertexBuffer),
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
641 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
642 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
643 var uniforms1 = asDescriptorSet(
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
644 Uniforms(
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
645 frameTexture: Image[BGRA](width: vulkan.swapchain.width, height: vulkan.swapchain.height, isRenderTarget: true),
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
646 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
647 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
648 AssignBuffers(renderdata, mesh)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
649 AssignBuffers(renderdata, quad)
1228
4e465583ea32 did: rename texture to image
sam <sam@basx.dev>
parents: 1223
diff changeset
650 UploadImages(renderdata, uniforms1)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
651 renderdata.FlushAllMemory()
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
652
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
653 var
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
654 drawPipeline = CreatePipeline[TriangleShader](renderPass = offscreenRP)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
655 presentPipeline = CreatePipeline[PresentShader](renderPass = presentRP)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
656
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
657 InitDescriptorSet(renderdata, presentPipeline.descriptorSetLayouts[0], uniforms1)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
658
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
659 # create depth buffer images (will not use the one in the swapchain
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
660 var
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
661 depthImage: VkImage
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
662 depthImageView: VkImageView
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
663 depthMemory: VkDeviceMemory
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
664 if offscreenRP.depthBuffer:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
665 depthImage = svkCreate2DImage(
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
666 width = vulkan.swapchain.width,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
667 height = vulkan.swapchain.height,
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
668 format = DEPTH_FORMAT,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
669 usage = [VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT],
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
670 samples = offscreenRP.samples,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
671 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
672 let requirements = svkGetImageMemoryRequirements(depthImage)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
673 depthMemory = svkAllocateMemory(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
674 requirements.size,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
675 BestMemory(mappable = false, filter = requirements.memoryTypes)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
676 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
677 checkVkResult vkBindImageMemory(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
678 vulkan.device,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
679 depthImage,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
680 depthMemory,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
681 0,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
682 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
683 depthImageView = svkCreate2DImageView(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
684 image = depthImage,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
685 format = DEPTH_FORMAT,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
686 aspect = VK_IMAGE_ASPECT_DEPTH_BIT
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
687 )
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
688
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
689 # create msaa images (will not use the one in the swapchain
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
690 var
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
691 msaaImage: VkImage
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
692 msaaImageView: VkImageView
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
693 msaaMemory: VkDeviceMemory
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
694 if offscreenRP.samples != VK_SAMPLE_COUNT_1_BIT:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
695 msaaImage = svkCreate2DImage(
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
696 width = vulkan.swapchain.width,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
697 height = vulkan.swapchain.height,
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
698 format = SURFACE_FORMAT,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
699 usage = [VK_IMAGE_USAGE_SAMPLED_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT],
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
700 samples = offscreenRP.samples,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
701 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
702 let requirements = svkGetImageMemoryRequirements(msaaImage)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
703 msaaMemory = svkAllocateMemory(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
704 requirements.size,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
705 BestMemory(mappable = false, filter = requirements.memoryTypes)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
706 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
707 checkVkResult vkBindImageMemory(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
708 vulkan.device,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
709 msaaImage,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
710 msaaMemory,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
711 0,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
712 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
713 msaaImageView = svkCreate2DImageView(image = msaaImage, format = SURFACE_FORMAT)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
714
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
715 var attachments: seq[VkImageView]
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
716 if offscreenRP.samples == VK_SAMPLE_COUNT_1_BIT:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
717 if offscreenRP.depthBuffer:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
718 attachments = @[uniforms1.data.frameTexture.imageview, depthImageView]
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
719 else:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
720 attachments = @[uniforms1.data.frameTexture.imageview]
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
721 else:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
722 if offscreenRP.depthBuffer:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
723 attachments = @[msaaImageView, depthImageView, uniforms1.data.frameTexture.imageview]
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
724 else:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
725 attachments = @[msaaImageView, uniforms1.data.frameTexture.imageview]
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
726 var offscreenFB = svkCreateFramebuffer(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
727 offscreenRP.vk,
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
728 vulkan.swapchain.width,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
729 vulkan.swapchain.height,
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
730 attachments
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
731 )
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
732
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
733 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
734 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
735
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
736 WithNextFrame(framebuffer, commandbuffer):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
737
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
738 WithRenderPass(offscreenRP, offscreenFB, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
739 WithPipeline(commandbuffer, drawPipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
740 Render(commandbuffer = commandbuffer, pipeline = drawPipeline, mesh = mesh)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
741
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
742 WithRenderPass(presentRP, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, NewVec4f(0, 0, 0, 0)):
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
743
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
744 WithPipeline(commandbuffer, presentPipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
745
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
746 WithBind(commandbuffer, (uniforms1, ), presentPipeline):
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
747 Render(commandbuffer = commandbuffer, pipeline = presentPipeline, mesh = quad)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
748
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
749 # cleanup
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
750 checkVkResult vkDeviceWaitIdle(vulkan.device)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
751 DestroyPipeline(presentPipeline)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
752 DestroyPipeline(drawPipeline)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
753 DestroyRenderData(renderdata)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
754 if depthImage.Valid:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
755 vkDestroyImageView(vulkan.device, depthImageView, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
756 vkDestroyImage(vulkan.device, depthImage, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
757 vkFreeMemory(vulkan.device, depthMemory, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
758 if msaaImage.Valid:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
759 vkDestroyImageView(vulkan.device, msaaImageView, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
760 vkDestroyImage(vulkan.device, msaaImage, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
761 vkFreeMemory(vulkan.device, msaaMemory, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
762 vkDestroyRenderPass(vulkan.device, offscreenRP.vk, nil)
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
763 vkDestroyRenderPass(vulkan.device, presentRP.vk, nil)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
764 vkDestroyFramebuffer(vulkan.device, offscreenFB, nil)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
765 ClearSwapchain()
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
766
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
767 when isMainModule:
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
768 var time = 1'f32
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
769 InitVulkan()
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
770
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
771 var mainRenderpass: RenderPass
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
772 var renderPasses = [
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
773 (depthBuffer: false, samples: VK_SAMPLE_COUNT_1_BIT),
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
774 (depthBuffer: false, samples: VK_SAMPLE_COUNT_4_BIT),
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
775 (depthBuffer: true, samples: VK_SAMPLE_COUNT_1_BIT),
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
776 (depthBuffer: true, samples: VK_SAMPLE_COUNT_4_BIT),
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
777 ]
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
778
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
779
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
780 # test normal
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
781 for i, (depthBuffer, samples) in renderPasses:
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
782 var renderpass = CreateDirectPresentationRenderPass(depthBuffer = depthBuffer, samples = samples)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
783 SetupSwapchain(renderpass = renderpass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
784
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
785 # tests a simple triangle with minimalistic shader and vertex format
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
786 test_01_triangle(time)
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
787
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
788 # tests instanced triangles and quads, mixing meshes and instances
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
789 test_02_triangle_quad_instanced(time)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
790
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
791 # teste descriptor sets
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
792 test_03_simple_descriptorset(time)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
793
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
794 # tests multiple descriptor sets and arrays
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
795 test_04_multiple_descriptorsets(time)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
796
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
797 # rotating cube
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
798 test_05_cube(time)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
799
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
800 # different draw modes (lines, points, and topologies)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
801 test_06_different_draw_modes(time)
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
802
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
803 # load PNG texture
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
804 test_07_png_texture(time)
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
805
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
806 checkVkResult vkDeviceWaitIdle(vulkan.device)
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
807 vkDestroyRenderPass(vulkan.device, renderpass.vk, nil)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1235
diff changeset
808 ClearSwapchain()
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
809
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
810 # test multiple render passes
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
811 for i, (depthBuffer, samples) in renderPasses:
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
812 test_08_triangle_2pass(time, depthBuffer, samples)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
813
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
814 DestroyVulkan()