games/semicongine: tests/test_rendering.nim comparison

comparison tests/test_rendering.nim @ 1322:4a1c2b1128bc

did: improve handling of descriptor sets

author	sam <sam@basx.dev>
date	Thu, 15 Aug 2024 18:30:00 +0700
parents	6d0162bfe48a
children	df3c075e5dea

comparison

equal deleted inserted replaced

-:385dbd68a947
+:4a1c2b1128bc
 PushConstant = object
 scale: float32
 Shader = object
 position {.VertexAttribute.}: Vec3f
 color {.VertexAttribute.}: Vec3f
-pushConstant {.PushConstantAttribute.}: PushConstant
+pushConstant {.PushConstant.}: PushConstant
 fragmentColor {.Pass.}: Vec3f
 outColor {.ShaderOutput.}: Vec4f
 # code
 vertexCode: string = """void main() {
 fragmentColor = color;
 QuadShader = object
 position {.VertexAttribute.}: Vec3f
 fragmentColor {.Pass.}: Vec3f
 uv {.Pass.}: Vec2f
 outColor {.ShaderOutput.}: Vec4f
-descriptorSets {.DescriptorSets.}: (Uniforms, )
+descriptorSets {.DescriptorSet: 0.}: Uniforms
 # code
 vertexCode: string = """void main() {
 fragmentColor = material.baseColor;
 gl_Position = vec4(position, 1);
 gl_Position.x += ((material.baseColor.b - 0.5) * 2) - 0.5;
 var
 quad = QuadMesh(
 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),
 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
 )
-uniforms1 = asDescriptorSet(
+uniforms1 = asDescriptorSetData(
 Uniforms(
 material: asGPUValue(Material(baseColor: vec3(1, 1, 1)), UniformBuffer),
 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),
 )
 )
-uniforms2 = asDescriptorSet(
+uniforms2 = asDescriptorSetData(
 Uniforms(
 material: asGPUValue(Material(baseColor: vec3(0.5, 0.5, 0.5)), UniformBuffer),
 texture1: Image[BGRA](width: 2, height: 2, data: @[R, G, B, W]),
 )
 )
 withRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)):
 withPipeline(commandbuffer, pipeline):
-withBind(commandbuffer, (uniforms1, ), pipeline):
+bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
-withBind(commandbuffer, (uniforms2, ), pipeline):
+bindDescriptorSet(commandbuffer, uniforms2, 0, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
 # cleanup
 checkVkResult vkDeviceWaitIdle(vulkan.device)
 destroyPipeline(pipeline)
 destroyRenderData(renderdata)
 QuadShader = object
 position {.VertexAttribute.}: Vec3f
 fragmentColor {.Pass.}: Vec3f
 uv {.Pass.}: Vec2f
 outColor {.ShaderOutput.}: Vec4f
-descriptorSets {.DescriptorSets.}: (ConstSet, MainSet, OtherSet)
+descriptorSets0 {.DescriptorSet: 0.}: ConstSet
+descriptorSets1 {.DescriptorSet: 1.}: MainSet
+descriptorSets2 {.DescriptorSet: 2.}: OtherSet
 # code
 vertexCode: string = """void main() {
 fragmentColor = material[objectSettings.materialIndex].baseColor * renderSettings.brigthness;
 gl_Position = vec4(position * objectSettings.scale, 1);
 gl_Position.xy += constants.offset.xy;
 var quad = QuadMesh(
 position: asGPUArray([vec3(-0.5, -0.5), vec3(-0.5, 0.5), vec3(0.5, 0.5), vec3(0.5, -0.5)], VertexBuffer),
 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
 )
-var constset = asDescriptorSet(
+var constset = asDescriptorSetData(
 ConstSet(
 constants: asGPUValue(Constants(offset: vec2(-0.3, 0.2)), UniformBuffer),
 )
 )
 let G = Gray([50'u8])
 let W = Gray([255'u8])
-var mainset = asDescriptorSet(
+var mainset = asDescriptorSetData(
 MainSet(
 renderSettings: asGPUValue(RenderSettings(brigthness: 0), UniformBufferMapped),
 material: [
 asGPUValue(Material(baseColor: vec3(1, 1, 0)), UniformBuffer),
 asGPUValue(Material(baseColor: vec3(1, 0, 1)), UniformBuffer),
 Image[Gray](width: 2, height: 2, data: @[W, G, G, W], minInterpolation: VK_FILTER_NEAREST, magInterpolation: VK_FILTER_NEAREST),
 Image[Gray](width: 3, height: 3, data: @[W, G, W, G, W, G, W, G, W], minInterpolation: VK_FILTER_NEAREST, magInterpolation: VK_FILTER_NEAREST),
 ],
 ),
 )
-var otherset1 = asDescriptorSet(
+var otherset1 = asDescriptorSetData(
 OtherSet(
 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 0), UniformBufferMapped),
 )
 )
-var otherset2 = asDescriptorSet(
+var otherset2 = asDescriptorSetData(
 OtherSet(
 objectSettings: asGPUValue(ObjectSettings(scale: 1.0, materialIndex: 1), UniformBufferMapped),
 )
 )
 var start = getMonoTime()
 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
 withNextFrame(framebuffer, commandbuffer):
+bindDescriptorSet(commandbuffer, constset, 0, pipeline)
+bindDescriptorSet(commandbuffer, mainset, 1, pipeline)
 withRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)):
 withPipeline(commandbuffer, pipeline):
-withBind(commandbuffer, (constset, mainset, otherset1), pipeline):
+bindDescriptorSet(commandbuffer, otherset1, 2, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
-withBind(commandbuffer, (constset, mainset, otherset2), pipeline):
+bindDescriptorSet(commandbuffer, otherset2, 2, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = quad)
 mainset.data.renderSettings.data.brigthness = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
 otherset1.data.objectSettings.data.scale = 0.5 + ((getMonoTime() - start).inMilliseconds().int / 1000) / time
 updateGPUBuffer(mainset.data.renderSettings)
 updateGPUBuffer(otherset1.data.objectSettings)
 CubeShader = object
 position {.VertexAttribute.}: Vec3f
 color {.VertexAttribute.}: Vec4f
 fragmentColor {.Pass.}: Vec4f
 outColor {.ShaderOutput.}: Vec4f
-descriptorSets {.DescriptorSets.}: (Uniforms, )
+descriptorSets {.DescriptorSet: 0.}: Uniforms
 # code
 vertexCode = """void main() {
 fragmentColor = color;
 gl_Position = vec4(position, 1) * data.mvp;
 }"""
 color: asGPUArray(newSeqWith(6, vec4(0.1, 0.1, 0.1, 1)), VertexBuffer),
 normals: asGPUArray(newSeqWith(6, Y), VertexBuffer),
 )
 assignBuffers(renderdata, floor)
-var uniforms1 = asDescriptorSet(
+var uniforms1 = asDescriptorSetData(
 Uniforms(
 data: asGPUValue(UniformData(mvp: Unit4), UniformBufferMapped)
 )
 )
 assignBuffers(renderdata, uniforms1)
 withNextFrame(framebuffer, commandbuffer):
 withRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)):
 withPipeline(commandbuffer, pipeline):
-withBind(commandbuffer, (uniforms1, ), pipeline):
+bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = floor)
 let tEndLoop = getMonoTime() - tStart
 let looptime = tEndLoop - tStartLoop
 let waitTime = 16_666 - looptime.inMicroseconds
 if waitTime > 0:
 Shader = object
 position {.VertexAttribute.}: Vec3f
 uv {.VertexAttribute.}: Vec2f
 fragmentUv {.Pass.}: Vec2f
 outColor {.ShaderOutput.}: Vec4f
-descriptorSets {.DescriptorSets.}: (Uniforms, )
+descriptorSets {.DescriptorSet: 0.}: Uniforms
 # code
 vertexCode: string = """
 void main() {
 fragmentUv = uv;
 gl_Position = vec4(position, 1);
 )
 assignBuffers(renderdata, mesh)
 renderdata.flushAllMemory()
 var pipeline = createPipeline[Shader](renderPass = vulkan.swapchain.renderPass)
-var uniforms1 = asDescriptorSet(
+var uniforms1 = asDescriptorSetData(
 Uniforms(
 texture1: loadImage[BGRA]("art.png"),
 )
 )
 uploadImages(renderdata, uniforms1)
 withRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)):
 withPipeline(commandbuffer, pipeline):
-withBind(commandbuffer, (uniforms1, ), pipeline):
+bindDescriptorSet(commandbuffer, uniforms1, 0, pipeline)
 render(commandbuffer = commandbuffer, pipeline = pipeline, mesh = mesh)
 # cleanup
 checkVkResult vkDeviceWaitIdle(vulkan.device)
 destroyPipeline(pipeline)
 destroyRenderData(renderdata)
 outColor = vec4(fragmentColor, 1);}"""
 PresentShader = object
 position {.VertexAttribute.}: Vec2f
 uv {.Pass.}: Vec2f
 outColor {.ShaderOutput.}: Vec4f
-descriptorSets {.DescriptorSets.}: (Uniforms, )
+descriptorSets {.DescriptorSet: 0.}: Uniforms
 # code
 vertexCode: string = """void main() {
 uv = ((position + 1) * 0.5) * vec2(1, -1);
 gl_Position = vec4(position, 0, 1);}"""
 fragmentCode: string = """void main() {
 )
 var quad = QuadMesh(
 position: asGPUArray([vec2(-1, -1), vec2(-1, 1), vec2(1, 1), vec2(1, -1)], VertexBuffer),
 indices: asGPUArray([0'u16, 1'u16, 2'u16, 2'u16, 3'u16, 0'u16], IndexBuffer),
 )
-var uniforms1 = asDescriptorSet(
+var uniforms1 = asDescriptorSetData(
 Uniforms(
 frameTexture: Image[BGRA](width: vulkan.swapchain.width, height: vulkan.swapchain.height, isRenderTarget: true),
 )
 )
 assignBuffers(renderdata, mesh)
 withRenderPass(presentRP, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)):
 withPipeline(commandbuffer, presentPipeline):
-withBind(commandbuffer, (uniforms1, ), presentPipeline):
+bindDescriptorSet(commandbuffer, uniforms1, 0, presentPipeline)
 render(commandbuffer = commandbuffer, pipeline = presentPipeline, mesh = quad)
 # cleanup
 checkVkResult vkDeviceWaitIdle(vulkan.device)
 destroyPipeline(presentPipeline)
 destroyPipeline(drawPipeline)

Mercurial > games > semicongine

comparison tests/test_rendering.nim @ 1322:4a1c2b1128bc