annotate tests/test_rendering.nim @ 1498:d3d667bbdda4 default tip

did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
author sam <sam@basx.dev>
date Thu, 25 Sep 2025 23:53:41 +0700
parents 676fc13685a9
children
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
1299
6d0162bfe48a did: finish mentioned refactoring, no API changes still
sam <sam@basx.dev>
parents: 1285
diff changeset
3 import std/math
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
4 import std/monotimes
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
5 import std/times
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
6 import std/options
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
7 import std/random
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
8
1267
4cf9872f7bb6 did: rename back to old name (no v2)
sam <sam@basx.dev>
parents: 1252
diff changeset
9 import ../semicongine
1427
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
10 import ../semicongine/rendering
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
11 import ../semicongine/input
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
12 import ../semicongine/loaders
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
13 import ../semicongine/images
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
14
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
15 proc test_01_triangle(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
16 var renderdata = initRenderData()
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
17
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
18 type
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
19 PushConstant = object
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
20 scale: float32
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
21
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
22 Shader = object
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
23 position {.VertexAttribute.}: Vec3f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
24 color {.VertexAttribute.}: Vec3f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
25 pushConstant {.PushConstant.}: PushConstant
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
26 fragmentColor {.Pass.}: Vec3f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
27 outColor {.ShaderOutput.}: Vec4f
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
28 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
29 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
30 """void main() {
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
31 fragmentColor = color;
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
32 gl_Position = vec4(position * pushConstant.scale, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
33 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
34 """void main() {
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
35 outColor = vec4(fragmentColor, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
36
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
37 TriangleMesh = object
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
38 position: GPUArray[Vec3f, VertexBuffer]
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
39 color: GPUArray[Vec3f, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
40
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
41 var mesh = TriangleMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
42 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
43 [vec3(-0.5, -0.5, 0), vec3(0, 0.5, 0), vec3(0.5, -0.5, 0)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
44 ),
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
45 color: asGPUArray([vec3(0, 0, 1), vec3(0, 1, 0), vec3(1, 0, 0)], VertexBuffer),
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
46 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
47 assignBuffers(renderdata, mesh)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
48 renderdata.flushAllMemory()
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
49
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
50 var pipeline = createPipeline(Shader(), renderPass = renderPass)
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
51
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
52 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
53 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
54 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
55 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
56 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
57 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
58 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
59 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
60 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
61 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
62 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
63 withPipeline(commandbuffer, pipeline):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
64 renderWithPushConstant(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
65 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
66 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
67 mesh = mesh,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
68 pushConstant = PushConstant(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
69 scale: 0.3 + ((getMonoTime() - start).inMilliseconds().int / 1000)
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
70 ),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
71 )
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
72
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
73 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
74 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
75 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
76 destroyRenderData(renderdata)
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
77
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
78 proc test_02_triangle_quad_instanced(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
79 var renderdata = initRenderData()
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
80
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
81 type
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
82 SomeShader = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
83 position {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
84 color {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
85 pos {.InstanceAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
86 scale {.InstanceAttribute.}: float32
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
87 fragmentColor {.Pass.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
88 outColor {.ShaderOutput.}: Vec4f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
89 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
90 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
91 """void main() {
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
92 fragmentColor = color;
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
93 gl_Position = vec4((position * scale) + pos, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
94 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
95 """void main() {
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
96 outColor = vec4(fragmentColor, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
97
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
98 TriangleMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
99 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
100 color: GPUArray[Vec3f, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
101
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
102 QuadMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
103 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
104 color: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
105 indices: GPUArray[uint16, IndexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
106
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
107 Instances = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
108 pos: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
109 scale: GPUArray[float32, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
110
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
111 var tri = TriangleMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
112 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
113 [vec3(-0.5, -0.5, 0), vec3(0, 0.5, 0), vec3(0.5, -0.5, 0)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
114 ),
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
115 color: asGPUArray([vec3(0, 0, 1), vec3(0, 1, 0), vec3(1, 0, 0)], VertexBuffer),
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
116 )
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
117 var quad = QuadMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
118 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
119 [vec3(-0.3, -0.3, 0), vec3(-0.3, 0.3, 0), vec3(0.3, 0.3, 0), vec3(0.3, -0.3, 0)],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
120 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
121 ),
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
122 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
123 color: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
124 [vec3(1, 1, 1), vec3(1, 1, 1), vec3(1, 1, 1), vec3(1, 1, 1)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
125 ),
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
126 )
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
127
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
128 var instancesA: Instances
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
129 for n in 1 .. 100:
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
130 instancesA.pos.data.add vec3(rand(-0.8'f32 .. 0.8'f32), rand(-0.8'f32 .. 0'f32), 0)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
131 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
132 var instancesB: Instances
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
133 for n in 1 .. 100:
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
134 instancesB.pos.data.add vec3(rand(-0.8'f32 .. 0.8'f32), rand(0'f32 .. 0.8'f32), 0)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
135 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
136
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
137 assignBuffers(renderdata, tri)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
138 assignBuffers(renderdata, quad)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
139 assignBuffers(renderdata, instancesA)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
140 assignBuffers(renderdata, instancesB)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
141 renderdata.flushAllMemory()
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
142
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
143 var pipeline = createPipeline(SomeShader(), renderPass = renderPass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
144
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
145 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
146 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
147 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
148 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
149 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
150 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
151 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
152 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
153 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
154 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
155 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
156 withPipeline(commandbuffer, pipeline):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
157 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
158 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
159 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
160 mesh = quad,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
161 instances = instancesA,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
162 )
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
163 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
164 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
165 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
166 mesh = quad,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
167 instances = instancesB,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
168 )
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
169 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
170 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
171 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
172 mesh = tri,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
173 instances = instancesA,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
174 )
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
175 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
176 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
177 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
178 mesh = tri,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
179 instances = instancesB,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
180 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
181
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
182 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
183 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
184 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
185 destroyRenderData(renderdata)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
186
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
187 proc test_03_simple_descriptorset(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
188 var renderdata = initRenderData()
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
189
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
190 type
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
191 Material = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
192 baseColor: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
193
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
194 Uniforms = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
195 material: GPUValue[Material, UniformBuffer]
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
196 texture1: Image[BGRA]
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
197
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
198 QuadShader = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
199 position {.VertexAttribute.}: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
200 fragmentColor {.Pass.}: Vec3f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
201 uv {.Pass.}: Vec2f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
202 outColor {.ShaderOutput.}: Vec4f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
203 descriptorSets {.DescriptorSet: 0.}: Uniforms
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
204 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
205 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
206 """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
207 fragmentColor = material.baseColor;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
208 gl_Position = vec4(position, 1);
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
209 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
210 uv = position.xy + 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
211 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
212 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
213 """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
214 outColor = vec4(fragmentColor, 1) * texture(texture1, uv);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
215
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
216 QuadMesh = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
217 position: GPUArray[Vec3f, VertexBuffer]
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
218 indices: GPUArray[uint16, IndexBuffer]
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
219
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
220 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
221 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
222 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
223 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
224 var
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
225 quad = QuadMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
226 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
227 [vec3(-0.5, -0.5, 0), vec3(-0.5, 0.5, 0), vec3(0.5, 0.5, 0), vec3(0.5, -0.5, 0)],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
228 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
229 ),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
230 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
231 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
232 uniforms1 = asDescriptorSetData(
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
233 Uniforms(
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
234 material: asGPUValue(Material(baseColor: vec3(1, 1, 1)), UniformBuffer),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
235 texture1: Image[BGRA](
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
236 width: 3,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
237 height: 3,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
238 data: @[R, G, B, G, B, R, B, R, G],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
239 minInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
240 magInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
241 ),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
242 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
243 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
244 uniforms2 = asDescriptorSetData(
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
245 Uniforms(
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
246 material: asGPUValue(Material(baseColor: vec3(0.5, 0.5, 0.5)), UniformBuffer),
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
247 texture1: Image[BGRA](width: 2, height: 2, data: @[R, G, B, W]),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
248 )
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
249 )
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
250
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
251 assignBuffers(renderdata, quad)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
252 assignBuffers(renderdata, uniforms1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
253 assignBuffers(renderdata, uniforms2)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
254 uploadImages(renderdata, uniforms1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
255 uploadImages(renderdata, uniforms2)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
256 renderdata.flushAllMemory()
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
257
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
258 var pipeline = createPipeline(QuadShader(), renderPass = renderPass)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
259
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
260 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
261 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms2)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
262
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
263 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
264 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
265 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
266 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
267 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
268 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
269 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
270 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
271 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
272 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
273 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
274 withPipeline(commandbuffer, pipeline):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
275 bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
276 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
277
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
278 bindDescriptorSet(commandbuffer, uniforms2, 0, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
279 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
1210
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 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
282 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
283 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
284 destroyRenderData(renderdata)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
285
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
286 proc test_04_multiple_descriptorsets(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
287 var renderdata = initRenderData()
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
288
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
289 type
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
290 RenderSettings = object
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
291 brigthness: float32
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
292
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
293 Material = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
294 baseColor: Vec3f
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
295
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
296 ObjectSettings = object
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
297 scale: float32
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
298 materialIndex: uint32
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
299
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
300 Constants = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
301 offset: Vec2f
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
302
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
303 ConstSet = object
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
304 constants: GPUValue[Constants, UniformBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
305
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
306 MainSet = object
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
307 renderSettings: GPUValue[RenderSettings, UniformBufferMapped]
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
308 material: array[2, GPUValue[Material, UniformBuffer]]
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
309 texture1: array[2, Image[Gray]]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
310
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
311 OtherSet = object
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
312 objectSettings: GPUValue[ObjectSettings, UniformBufferMapped]
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
313
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
314 QuadShader = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
315 position {.VertexAttribute.}: Vec3f
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
316 fragmentColor {.Pass.}: Vec3f
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
317 uv {.Pass.}: Vec2f
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
318 outColor {.ShaderOutput.}: Vec4f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
319 descriptorSets0 {.DescriptorSet: 0.}: ConstSet
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
320 descriptorSets1 {.DescriptorSet: 1.}: MainSet
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
321 descriptorSets2 {.DescriptorSet: 2.}: OtherSet
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
322 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
323 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
324 """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
325 fragmentColor = material[objectSettings.materialIndex].baseColor * renderSettings.brigthness;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
326 gl_Position = vec4(position * objectSettings.scale, 1);
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
327 gl_Position.xy += constants.offset.xy;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
328 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
329 uv = position.xy + 0.5;
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
330 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
331 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
332 """void main() {
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
333 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
334 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
335
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
336 QuadMesh = object
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
337 position: GPUArray[Vec3f, VertexBuffer]
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
338 indices: GPUArray[uint16, IndexBuffer]
1203
6360c8d17ce0 did: preprations to add rendering tests
sam <sam@basx.dev>
parents:
diff changeset
339
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
340 var quad = QuadMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
341 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
342 [vec3(-0.5, -0.5), vec3(-0.5, 0.5), vec3(0.5, 0.5), vec3(0.5, -0.5)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
343 ),
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
344 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
345 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
346 var constset = asDescriptorSetData(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
347 ConstSet(constants: asGPUValue(Constants(offset: vec2(-0.3, 0.2)), UniformBuffer))
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
348 )
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
349 let G = Gray([50'u8])
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
350 let W = Gray([255'u8])
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
351 var mainset = asDescriptorSetData(
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
352 MainSet(
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
353 renderSettings: asGPUValue(RenderSettings(brigthness: 0), UniformBufferMapped),
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
354 material: [
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
355 asGPUValue(Material(baseColor: vec3(1, 1, 0)), UniformBuffer),
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
356 asGPUValue(Material(baseColor: vec3(1, 0, 1)), UniformBuffer),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
357 ],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
358 texture1: [
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
359 Image[Gray](
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
360 width: 2,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
361 height: 2,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
362 data: @[W, G, G, W],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
363 minInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
364 magInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
365 ),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
366 Image[Gray](
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
367 width: 3,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
368 height: 3,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
369 data: @[W, G, W, G, W, G, W, G, W],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
370 minInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
371 magInterpolation: VK_FILTER_NEAREST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
372 ),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
373 ],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
374 )
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
375 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
376 var otherset1 = asDescriptorSetData(
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
377 OtherSet(
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
378 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 0), UniformBufferMapped)
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
379 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
380 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
381 var otherset2 = asDescriptorSetData(
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
382 OtherSet(
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
383 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 1), UniformBufferMapped)
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
384 )
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
385 )
1209
e177336cac3f sync to notebook in bedroom
sam <sam@basx.dev>
parents: 1208
diff changeset
386
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
387 assignBuffers(renderdata, quad)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
388 assignBuffers(renderdata, constset)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
389 assignBuffers(renderdata, mainset)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
390 assignBuffers(renderdata, otherset1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
391 assignBuffers(renderdata, otherset2)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
392 uploadImages(renderdata, mainset)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
393 renderdata.flushAllMemory()
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
394
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
395 var pipeline = createPipeline(QuadShader(), renderPass = renderPass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
396
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
397 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], constset)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
398 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[1], mainset)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
399 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[2], otherset1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
400 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
401
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
402 updateGPUBuffer(otherset2.data[0].objectSettings, frame=0)
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
403 updateGPUBuffer(otherset2.data[1].objectSettings, frame=1)
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
404
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
405 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
406 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
407
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
408 mainset.data[currentFiF()].renderSettings.data.brigthness = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
409 otherset1.data[currentFiF()].objectSettings.data.scale = 0.5 + ((getMonoTime() - start).inMilliseconds().int / 1000) / time
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
410 updateGPUBuffer(mainset.data[currentFiF()].renderSettings, frame=currentFiF())
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
411 updateGPUBuffer(otherset1.data[currentFiF()].objectSettings, frame=currentFiF())
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
412 updateGPUBuffer(otherset2.data[currentFiF()].objectSettings, frame=currentFiF())
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
413 renderdata.flushAllMemory()
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
414
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
415 withNextFrame(framebuffer, commandbuffer):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
416 bindDescriptorSet(commandbuffer, constset, 0, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
417 bindDescriptorSet(commandbuffer, mainset, 1, pipeline)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
418
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
419 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
420 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
421 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
422 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
423 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
424 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
425 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
426 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
427 withPipeline(commandbuffer, pipeline):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
428 bindDescriptorSet(commandbuffer, otherset1, 2, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
429 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
430
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
431 bindDescriptorSet(commandbuffer, otherset2, 2, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
432 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
433
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
434 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
435 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
436 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
437 destroyRenderData(renderdata)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
438
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
439 proc test_05_cube(time: float32, renderPass: RenderPass) =
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
440 type
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
441 UniformData = object
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
442 mvp: Mat4
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
443
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
444 Uniforms = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
445 data: GPUValue[UniformData, UniformBufferMapped]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
446
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
447 CubeShader = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
448 position {.VertexAttribute.}: Vec3f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
449 color {.VertexAttribute.}: Vec4f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
450 fragmentColor {.Pass.}: Vec4f
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
451 outColor {.ShaderOutput.}: Vec4f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
452 descriptorSets {.DescriptorSet: 0.}: Uniforms
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
453 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
454 vertexCode =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
455 """void main() {
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
456 fragmentColor = color;
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
457 gl_Position = vec4(position, 1) * data.mvp;
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
458 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
459 fragmentCode =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
460 """void main() {
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
461 outColor = fragmentColor;
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
462 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
463
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
464 Mesh = object
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
465 position: GPUArray[Vec3f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
466 normals: GPUArray[Vec3f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
467 color: GPUArray[Vec4f, VertexBuffer]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
468
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
469 let quad =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
470 @[
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
471 vec3(-0.5, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
472 vec3(-0.5, +0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
473 vec3(+0.5, +0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
474 vec3(+0.5, +0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
475 vec3(+0.5, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
476 vec3(-0.5, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
477 ]
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
478 proc transf(data: seq[Vec3f], mat: Mat4): seq[Vec3f] =
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
479 for v in data:
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
480 result.add mat * v
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
481
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
482 var
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
483 vertices: seq[Vec3f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
484 colors: seq[Vec4f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
485 normals: seq[Vec3f]
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
486
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
487 # front, red
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
488 vertices.add quad.transf(translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
489 colors.add newSeqWith(6, vec4(1, 0, 0, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
490 normals.add newSeqWith(6, vec3(0, 0, -1))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
491
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
492 # back, cyan
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
493 vertices.add quad.transf(rotate(PI, Y) * translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
494 colors.add newSeqWith(6, vec4(0, 1, 1, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
495 normals.add newSeqWith(6, vec3(0, 0, 1))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
496
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
497 # right, green
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
498 vertices.add quad.transf(rotate(PI / 2, Y) * translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
499 colors.add newSeqWith(6, vec4(0, 1, 0, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
500 normals.add newSeqWith(6, vec3(-1, 0, 0))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
501
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
502 # left, magenta
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
503 vertices.add quad.transf(rotate(-PI / 2, Y) * translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
504 colors.add newSeqWith(6, vec4(1, 0, 1, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
505 normals.add newSeqWith(6, vec3(1, 0, 0))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
506
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
507 # bottom, blue
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
508 vertices.add quad.transf(rotate(PI / 2, X) * translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
509 colors.add newSeqWith(6, vec4(0, 0, 1, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
510 normals.add newSeqWith(6, vec3(0, -1, 0))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
511
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
512 # top, yellow
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
513 vertices.add quad.transf(rotate(-PI / 2, X) * translate(0, 0, -0.5))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
514 colors.add newSeqWith(6, vec4(1, 1, 0, 1))
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
515 normals.add newSeqWith(6, vec3(0, 1, 0))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
516
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
517 var renderdata = initRenderData()
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
518
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
519 var mesh = Mesh(
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
520 position: asGPUArray(vertices, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
521 color: asGPUArray(colors, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
522 normals: asGPUArray(normals, VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
523 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
524 assignBuffers(renderdata, mesh)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
525
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
526 var floor = Mesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
527 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
528 quad.transf(scale(10, 10, 10) * rotate(-PI / 2, X) * translate(0, 0, 0.05)),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
529 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
530 ),
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
531 color: asGPUArray(newSeqWith(6, vec4(0.1, 0.1, 0.1, 1)), VertexBuffer),
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
532 normals: asGPUArray(newSeqWith(6, Y), VertexBuffer),
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
533 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
534 assignBuffers(renderdata, floor)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
535
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
536 var uniforms1 = asDescriptorSetData(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
537 Uniforms(data: asGPUValue(UniformData(mvp: Unit4), UniformBufferMapped))
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
538 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
539 assignBuffers(renderdata, uniforms1)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
540
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
541 renderdata.flushAllMemory()
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
542
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
543 var pipeline = createPipeline(CubeShader(), renderPass = renderPass)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
544 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
545
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
546 var tStart = getMonoTime()
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
547 var t = tStart
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
548
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
549 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
550 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
551 let tStartLoop = getMonoTime() - tStart
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
552
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
553 uniforms1.data[currentFiF()].data.data.mvp = (
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
554 projection(-PI / 2, getAspectRatio(), 0.01, 100) * translate(0, 0, 2) *
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
555 rotate(PI / 4, X) * rotate(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
556 PI * 0.1 * (tStartLoop.inMicroseconds() / 1_000_000), Y
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
557 )
1232
32a977c71ba5 fix: make matrices working correctly
sam <sam@basx.dev>
parents: 1231
diff changeset
558 )
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
559 updateGPUBuffer(uniforms1.data[currentFiF()].data, frame=currentFiF(), flush = true)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
560
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
561 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
562 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
563 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
564 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
565 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
566 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
567 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
568 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
569 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
570 withPipeline(commandbuffer, pipeline):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
571 bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
572 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
573 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
574
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
575 let tEndLoop = getMonoTime() - tStart
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
576 let looptime = tEndLoop - tStartLoop
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
577 let waitTime = 16_666 - looptime.inMicroseconds
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
578 if waitTime > 0:
1cf698973dca did: cleanup tests and old platform layer files
sam <sam@basx.dev>
parents: 1232
diff changeset
579 sleep((waitTime / 1000).int)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
580
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
581 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
582 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
583 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
584 destroyRenderData(renderdata)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
585
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
586 proc test_06_different_draw_modes(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
587 var renderdata = initRenderData()
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
588
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
589 type
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
590 Shader = object
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
591 position {.VertexAttribute.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
592 color {.VertexAttribute.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
593 fragmentColor {.Pass.}: Vec3f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
594 outColor {.ShaderOutput.}: Vec4f
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
595 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
596 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
597 """void main() {
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
598 gl_PointSize = 100;
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
599 fragmentColor = color;
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
600 gl_Position = vec4(position, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
601 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
602 """void main() {
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
603 outColor = vec4(fragmentColor, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
604
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
605 TriangleMesh = object
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
606 position: GPUArray[Vec3f, VertexBuffer]
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
607 color: GPUArray[Vec3f, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
608
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
609 var triangle = TriangleMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
610 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
611 [vec3(-0.5, -0.5, 0), vec3(0, 0.5, 0), vec3(0.5, -0.5, 0)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
612 ),
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
613 color: asGPUArray([vec3(0, 0, 1), vec3(0, 1, 0), vec3(1, 0, 0)], VertexBuffer),
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
614 )
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
615 var lines = TriangleMesh(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
616 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
617 [vec3(-0.9, 0, 0), vec3(-0.05, -0.9, 0), vec3(0.05, -0.9, 0), vec3(0.9, 0, 0)],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
618 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
619 ),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
620 color: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
621 [vec3(1, 1, 0), vec3(1, 1, 0), vec3(0, 1, 0), vec3(0, 1, 0)], VertexBuffer
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
622 ),
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
623 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
624 assignBuffers(renderdata, triangle)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
625 assignBuffers(renderdata, lines)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
626 renderdata.flushAllMemory()
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
627
1414
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
628 var pipeline1 = createPipeline(
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
629 Shader(),
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
630 renderPass = renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
631 polygonMode = VK_POLYGON_MODE_LINE,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
632 lineWidth = 20'f32,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
633 )
1414
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
634 var pipeline2 = createPipeline(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
635 Shader(), renderPass = renderPass, polygonMode = VK_POLYGON_MODE_POINT
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
636 )
1414
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
637 var pipeline3 = createPipeline(
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
638 Shader(),
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
639 renderPass = renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
640 topology = VK_PRIMITIVE_TOPOLOGY_LINE_LIST,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
641 lineWidth = 5,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
642 )
1414
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
643 var pipeline4 = createPipeline(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
644 Shader(), renderPass = renderPass, topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
645 )
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
646
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
647 var start = getMonoTime()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
648 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
649 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
650 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
651 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
652 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
653 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
654 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
655 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
656 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
657 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
658 withPipeline(commandbuffer, pipeline1):
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
659 render(commandbuffer = commandbuffer, pipeline = pipeline1, mesh = triangle)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
660 withPipeline(commandbuffer, pipeline2):
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
661 render(commandbuffer = commandbuffer, pipeline = pipeline2, mesh = triangle)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
662 withPipeline(commandbuffer, pipeline3):
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
663 render(commandbuffer = commandbuffer, pipeline = pipeline3, mesh = lines)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
664 withPipeline(commandbuffer, pipeline4):
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
665 render(commandbuffer = commandbuffer, pipeline = pipeline4, mesh = lines)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
666
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
667 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
668 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
669 destroyPipeline(pipeline1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
670 destroyPipeline(pipeline2)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
671 destroyPipeline(pipeline3)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
672 destroyPipeline(pipeline4)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
673 destroyRenderData(renderdata)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
674
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
675 proc test_08_texture_array(time: float32, renderPass: RenderPass) =
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
676 var renderdata = initRenderData()
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
677
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
678 type
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
679 Uniforms = object
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
680 textures: ImageArray[BGRA]
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
681
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
682 Shader = object
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
683 position {.VertexAttribute.}: Vec3f
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
684 uv {.VertexAttribute.}: Vec2f
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
685 fragmentUv {.Pass.}: Vec2f
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
686 outColor {.ShaderOutput.}: Vec4f
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
687 descriptorSets {.DescriptorSet: 0.}: Uniforms
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
688 # code
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
689 vertexCode: string =
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
690 """
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
691 void main() {
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
692 fragmentUv = uv;
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
693 gl_Position = vec4(position, 1);
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
694 }"""
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
695 fragmentCode: string =
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
696 """
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
697 void main() {
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
698 vec4 col1 = texture(textures, vec3(fragmentUv, 0));
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
699 vec4 col2 = texture(textures, vec3(fragmentUv, 1));
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
700 float w = length(fragmentUv * 2 - 1) / 1.41421;
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
701 outColor = (1 - w) * col1 + w * col2;
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
702 }"""
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
703
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
704 Quad = object
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
705 position: GPUArray[Vec3f, VertexBuffer]
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
706 uv: GPUArray[Vec2f, VertexBuffer]
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
707
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
708 var mesh = Quad(
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
709 position: asGPUArray(
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
710 [
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
711 vec3(-0.8, -0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
712 vec3(-0.8, 0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
713 vec3(0.8, 0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
714 vec3(0.8, 0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
715 vec3(0.8, -0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
716 vec3(-0.8, -0.5),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
717 ],
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
718 VertexBuffer,
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
719 ),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
720 uv: asGPUArray(
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
721 [vec2(0, 1), vec2(0, 0), vec2(1, 0), vec2(1, 0), vec2(1, 1), vec2(0, 1)],
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
722 VertexBuffer,
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
723 ),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
724 )
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
725 assignBuffers(renderdata, mesh)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
726 renderdata.flushAllMemory()
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
727
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
728 var pipeline = createPipeline(Shader(), renderPass = renderPass)
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
729 var uniforms1 = asDescriptorSetData(
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
730 Uniforms(textures: loadImageArray[BGRA](["art.png", "art1.png"]))
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
731 )
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
732 uploadImages(renderdata, uniforms1)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
733 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
734
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
735 var start = getMonoTime()
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
736 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
737 withNextFrame(framebuffer, commandbuffer):
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
738 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
739 renderPass,
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
740 framebuffer,
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
741 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
742 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
743 frameHeight(),
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
744 vec4(0, 0, 0, 0),
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
745 ):
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
746 withPipeline(commandbuffer, pipeline):
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
747 bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
748 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
749
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
750 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
751 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
752 destroyPipeline(pipeline)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
753 destroyRenderData(renderdata)
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
754
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
755 proc test_07_png_texture(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
756 var renderdata = initRenderData()
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
757
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
758 type
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
759 Uniforms = object
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
760 texture1: Image[BGRA]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
761
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
762 Shader = object
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
763 position {.VertexAttribute.}: Vec3f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
764 uv {.VertexAttribute.}: Vec2f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
765 fragmentUv {.Pass.}: Vec2f
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
766 outColor {.ShaderOutput.}: Vec4f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
767 descriptorSets {.DescriptorSet: 0.}: Uniforms
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
768 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
769 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
770 """
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
771 void main() {
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
772 fragmentUv = uv;
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
773 gl_Position = vec4(position, 1);
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
774 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
775 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
776 """
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
777 void main() {
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
778 outColor = texture(texture1, fragmentUv);
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
779 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
780
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
781 Quad = object
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
782 position: GPUArray[Vec3f, VertexBuffer]
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
783 uv: GPUArray[Vec2f, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
784
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
785 var mesh = Quad(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
786 position: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
787 [
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
788 vec3(-0.8, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
789 vec3(-0.8, 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
790 vec3(0.8, 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
791 vec3(0.8, 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
792 vec3(0.8, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
793 vec3(-0.8, -0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
794 ],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
795 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
796 ),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
797 uv: asGPUArray(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
798 [vec2(0, 1), vec2(0, 0), vec2(1, 0), vec2(1, 0), vec2(1, 1), vec2(0, 1)],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
799 VertexBuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
800 ),
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
801 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
802 assignBuffers(renderdata, mesh)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
803 renderdata.flushAllMemory()
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
804
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
805 var pipeline = createPipeline(Shader(), renderPass = renderPass)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
806 var uniforms1 = asDescriptorSetData(Uniforms(texture1: loadImage[BGRA]("art.png")))
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
807 uploadImages(renderdata, uniforms1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
808 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], uniforms1)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
809
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
810 var start = getMonoTime()
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
811 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
812 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
813 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
814 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
815 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
816 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
817 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
818 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
819 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
820 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
821 withPipeline(commandbuffer, pipeline):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
822 bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
823 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
824
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
825 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
826 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
827 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
828 destroyRenderData(renderdata)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
829
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
830 proc test_09_triangle_2pass(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
831 time: float32, depthBuffer: bool, samples: VkSampleCountFlagBits
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
832 ) =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
833 var (offscreenRP, presentRP) =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
834 createIndirectPresentationRenderPass(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
835
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
836 setupSwapchain(renderpass = presentRP, vSync = false, tripleBuffering = false)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
837
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
838 var renderdata = initRenderData()
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
839
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
840 type
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
841 Uniforms = object
1252
01e9f41d35b1 add:support for push constants
sam <sam@basx.dev>
parents: 1242
diff changeset
842 frameTexture: Image[BGRA]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
843
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
844 TriangleShader = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
845 position {.VertexAttribute.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
846 color {.VertexAttribute.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
847 fragmentColor {.Pass.}: Vec3f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
848 outColor {.ShaderOutput.}: Vec4f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
849 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
850 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
851 """void main() {
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
852 fragmentColor = color;
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
853 gl_Position = vec4(position, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
854 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
855 """void main() {
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
856 outColor = vec4(fragmentColor, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
857
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
858 PresentShader = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
859 position {.VertexAttribute.}: Vec2f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
860 uv {.Pass.}: Vec2f
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
861 outColor {.ShaderOutput.}: Vec4f
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
862 descriptorSets {.DescriptorSet: 0.}: Uniforms
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
863 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
864 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
865 """void main() {
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
866 uv = ((position + 1) * 0.5) * vec2(1, -1);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
867 gl_Position = vec4(position, 0, 1);}"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
868 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
869 """void main() {
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
870 vec2 uv1 = uv + vec2(0.001, 0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
871 vec2 uv2 = uv + vec2(0.001, -0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
872 vec2 uv3 = uv + vec2(-0.001, 0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
873 vec2 uv4 = uv + vec2(-0.001, -0.001);
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
874 outColor = (
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
875 texture(frameTexture, uv1) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
876 texture(frameTexture, uv2) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
877 texture(frameTexture, uv3) +
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
878 texture(frameTexture, uv4)
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
879 ) / 4;
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
880 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
881
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
882 TriangleMesh = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
883 position: GPUArray[Vec3f, VertexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
884 color: GPUArray[Vec3f, VertexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
885
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
886 QuadMesh = object
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
887 position: GPUArray[Vec2f, VertexBuffer]
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
888 indices: GPUArray[uint16, IndexBuffer]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
889
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
890 var mesh = TriangleMesh(
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
891 position: asGPUArray([vec3(-0.5, -0.5), vec3(0, 0.5), vec3(0.5, -0.5)], VertexBuffer),
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
892 color: asGPUArray([vec3(0, 0, 1), vec3(0, 1, 0), vec3(1, 0, 0)], VertexBuffer),
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
893 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
894 var quad = QuadMesh(
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
895 position: asGPUArray([vec2(-1, -1), vec2(-1, 1), vec2(1, 1), vec2(1, -1)], VertexBuffer),
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
896 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
897 )
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
898 var uniforms1 = asDescriptorSetData(
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
899 Uniforms(
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
900 frameTexture: Image[BGRA](width: frameWidth(), height: frameHeight(), isRenderTarget: true)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
901 )
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
902 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
903 assignBuffers(renderdata, mesh)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
904 assignBuffers(renderdata, quad)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
905 uploadImages(renderdata, uniforms1)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
906 renderdata.flushAllMemory()
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
907
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
908 var
1414
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
909 drawPipeline = createPipeline(TriangleShader(), renderPass = offscreenRP)
5e5a3311ca44 did: small improvment to allow easy adjustment of shader-code
sam <sam@basx.dev>
parents: 1375
diff changeset
910 presentPipeline = createPipeline(PresentShader(), renderPass = presentRP)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
911
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
912 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
913
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
914 # 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
915 var
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
916 depthImage: VkImage
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
917 depthImageView: VkImageView
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
918 depthMemory: VkDeviceMemory
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
919 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
920 depthImage = svkCreate2DImage(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
921 width = frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
922 height = frameHeight(),
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
923 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
924 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
925 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
926 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
927 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
928 depthMemory = svkAllocateMemory(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
929 requirements.size, bestMemory(mappable = false, filter = requirements.memoryTypes)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
930 )
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
931 checkVkResult vkBindImageMemory(engine().vulkan.device, depthImage, depthMemory, 0)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
932 depthImageView = svkCreate2DImageView(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
933 image = depthImage, format = DEPTH_FORMAT, aspect = VK_IMAGE_ASPECT_DEPTH_BIT
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
934 )
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
935
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
936 # create msaa images (will not use the one in the swapchain)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
937 var
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
938 msaaImage: VkImage
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
939 msaaImageView: VkImageView
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
940 msaaMemory: VkDeviceMemory
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
941 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
942 msaaImage = svkCreate2DImage(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
943 width = frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
944 height = frameHeight(),
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
945 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
946 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
947 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
948 )
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
949 let requirements = svkGetImageMemoryRequirements(msaaImage)
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
950 msaaMemory = svkAllocateMemory(requirements.size, bestMemory(mappable = false, filter = requirements.memoryTypes))
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
951 checkVkResult vkBindImageMemory(engine().vulkan.device, msaaImage, msaaMemory, 0)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
952 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
953
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
954 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
955 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
956 if offscreenRP.depthBuffer:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
957 attachments = @[uniforms1.data[currentFiF()].frameTexture.imageview, depthImageView]
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
958 else:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
959 attachments = @[uniforms1.data[currentFiF()].frameTexture.imageview]
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
960 else:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
961 if offscreenRP.depthBuffer:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
962 attachments = @[msaaImageView, depthImageView, uniforms1.data[currentFiF()].frameTexture.imageview]
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
963 else:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
964 attachments = @[msaaImageView, uniforms1.data[currentFiF()].frameTexture.imageview]
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
965 var offscreenFB = svkCreateFramebuffer(offscreenRP.vk, frameWidth(), frameHeight(), attachments)
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
966
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
967 renderdata.flushAllMemory()
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
968
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
969 var start = getMonoTime()
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
970 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
971 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
972 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
973 offscreenRP,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
974 offscreenFB,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
975 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
976 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
977 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
978 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
979 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
980 withPipeline(commandbuffer, drawPipeline):
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
981 render(commandbuffer = commandbuffer, pipeline = drawPipeline, mesh = mesh)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
982
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
983 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
984 presentRP,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
985 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
986 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
987 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
988 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
989 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
990 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
991 withPipeline(commandbuffer, presentPipeline):
1322
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
992 bindDescriptorSet(commandbuffer, uniforms1, 0, presentPipeline)
4a1c2b1128bc did: improve handling of descriptor sets
sam <sam@basx.dev>
parents: 1299
diff changeset
993 render(commandbuffer = commandbuffer, pipeline = presentPipeline, mesh = quad)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
994
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
995 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
996 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
997 destroyPipeline(presentPipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
998 destroyPipeline(drawPipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
999 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
1000 if depthImage.Valid:
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1001 vkDestroyImageView(engine().vulkan.device, depthImageView, nil)
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1002 vkDestroyImage(engine().vulkan.device, depthImage, nil)
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1003 vkFreeMemory(engine().vulkan.device, depthMemory, nil)
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
1004 if msaaImage.Valid:
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1005 vkDestroyImageView(engine().vulkan.device, msaaImageView, nil)
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1006 vkDestroyImage(engine().vulkan.device, msaaImage, nil)
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1007 vkFreeMemory(engine().vulkan.device, msaaMemory, nil)
1285
6d16003406fb add: missing destroy-function for renderpass
sam <sam@basx.dev>
parents: 1283
diff changeset
1008 destroyRenderPass(offscreenRP)
6d16003406fb add: missing destroy-function for renderpass
sam <sam@basx.dev>
parents: 1283
diff changeset
1009 destroyRenderPass(presentRP)
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1010 vkDestroyFramebuffer(engine().vulkan.device, offscreenFB, nil)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
1011 clearSwapchain()
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
1012
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1013 when isMainModule:
1235
c70fee6568f6 did: improv render tests to run without user input
sam <sam@basx.dev>
parents: 1233
diff changeset
1014 var time = 1'f32
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1015 initEngine("Test rendering")
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1016
1229
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering
sam <sam@basx.dev>
parents: 1228
diff changeset
1017 var renderPasses = [
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
1018 (depthBuffer: false, samples: VK_SAMPLE_COUNT_1_BIT),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
1019 (depthBuffer: false, samples: VK_SAMPLE_COUNT_4_BIT),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
1020 (depthBuffer: true, samples: VK_SAMPLE_COUNT_1_BIT),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1322
diff changeset
1021 (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
1022 ]
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
1023
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
1024 #[
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1025 # test normal
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
1026 var renderpass: RenderPass
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1027 for i, (depthBuffer, samples) in renderPasses:
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
1028 renderpass = createDirectPresentationRenderPass(depthBuffer = depthBuffer, samples = samples)
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
1029 setupSwapchain(renderpass = renderpass, vSync = false, tripleBuffering = false)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1030
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1031 # tests a simple triangle with minimalistic shader and vertex format
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1032 test_01_triangle(time, renderpass)
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1033
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1034 # tests instanced triangles and quads, mixing meshes and instances
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1035 test_02_triangle_quad_instanced(time, renderpass)
1210
570ac1620fb6 fix: make uniform-block-arrays working
sam <sam@basx.dev>
parents: 1209
diff changeset
1036
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1037 # teste descriptor sets
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1038 test_03_simple_descriptorset(time, renderpass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1039
1230
51221494caeb fix: uncomment all tests
sam <sam@basx.dev>
parents: 1229
diff changeset
1040 # tests multiple descriptor sets and arrays
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1041 test_04_multiple_descriptorsets(time, renderpass)
1231
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
1042
70f6c1cfe005 add: incomplete cube demo
sam <sam@basx.dev>
parents: 1230
diff changeset
1043 # rotating cube
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1044 test_05_cube(time, renderpass)
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1045
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
1046 # different draw modes (lines, points, and topologies)
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1047 test_06_different_draw_modes(time, renderpass)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
1048
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1049 test_07_png_texture(time, renderpass)
1334
d5a6f69dc855 add: support for multi-layer images
sam <sam@basx.dev>
parents: 1332
diff changeset
1050
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1051 test_08_texture_array(time, renderpass)
1242
e8b3dc80e48e add: PNG loading and tests for it
sam <sam@basx.dev>
parents: 1240
diff changeset
1052
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
1053 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1285
6d16003406fb add: missing destroy-function for renderpass
sam <sam@basx.dev>
parents: 1283
diff changeset
1054 destroyRenderPass(renderpass)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
1055 clearSwapchain()
1498
d3d667bbdda4 did: add support for per-frame-buffers, still need to limit this, to maybe only mapped buffers
sam <sam@basx.dev>
parents: 1427
diff changeset
1056 ]#
1204
e2901100a596 add: tests, some fixes, some helpers
sam <sam@basx.dev>
parents: 1203
diff changeset
1057
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
1058 # test multiple render passes
1375
ca3299ea1bdf did: make vector distinct from arrays, better code for compile-time handling of descriptors
sam <sam@basx.dev>
parents: 1334
diff changeset
1059 for i, (depthBuffer, samples) in renderPasses:
ca3299ea1bdf did: make vector distinct from arrays, better code for compile-time handling of descriptors
sam <sam@basx.dev>
parents: 1334
diff changeset
1060 test_09_triangle_2pass(time, depthBuffer, samples)
1214
04e446a7eb2b add: multipass renderer, finish tets for now
sam <sam@basx.dev>
parents: 1213
diff changeset
1061
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1280
diff changeset
1062 destroyVulkan()