games/semicongine: tests/test_rendering.nim annotate

annotate tests/test_rendering.nim @ 1329:ad09d41abd1e

add: 2d-scaling for text

author	sam <sam@basx.dev>
date	Sat, 17 Aug 2024 16:09:15 +0700
parents	4a1c2b1128bc
children	df3c075e5dea

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

Mercurial > games > semicongine

annotate tests/test_rendering.nim @ 1329:ad09d41abd1e