# HG changeset patch # User sam # Date 1723721820 -25200 # Node ID 3ba2c180e52c3751b3f359773da47f8929c592ea # Parent 4a1c2b1128bc4cd69c87c488f2235ac2dad5a8d5 fix: missing changes in tests diff -r 4a1c2b1128bc -r 3ba2c180e52c tests/test_gltf.nim --- a/tests/test_gltf.nim Thu Aug 15 18:30:00 2024 +0700 +++ b/tests/test_gltf.nim Thu Aug 15 18:37:00 2024 +0700 @@ -31,7 +31,7 @@ materials: array[50, GPUValue[Material, UniformBuffer]] camera: GPUValue[Camera, UniformBufferMapped] Shader = object - objectData {.PushConstantAttribute.}: ObjectData + objectData {.PushConstant.}: ObjectData position {.VertexAttribute.}: Vec3f color {.VertexAttribute.}: Vec4f normal {.VertexAttribute.}: Vec3f @@ -39,7 +39,7 @@ fragmentColor {.Pass.}: Vec4f fragmentNormal {.Pass.}: Vec3f outColor {.ShaderOutput.}: Vec4f - descriptors {.DescriptorSets.}: (MainDescriptors, ) + descriptors {.DescriptorSet: 0.}: MainDescriptors # code vertexCode: string = """ void main() { @@ -111,7 +111,7 @@ emissiveFactor: "emissive", ) ) - var descriptors = asDescriptorSet( + var descriptors = asDescriptorSetData( MainDescriptors( camera: asGPUValue(Camera( view: Unit4, @@ -185,14 +185,14 @@ withRenderPass(vulkan.swapchain.renderPass, framebuffer, commandbuffer, vulkan.swapchain.width, vulkan.swapchain.height, vec4(0, 0, 0, 0)): withPipeline(commandbuffer, pipeline): - withBind(commandbuffer, (descriptors, ), pipeline): - for nodeId in gltfData.scenes[0]: - drawNode( - commandbuffer = commandbuffer, - pipeline = pipeline, - nodeId = nodeId, - transform = rotate(PI / 2, Z) - ) + bindDescriptorSet(commandbuffer, descriptors, 0, pipeline) + for nodeId in gltfData.scenes[0]: + drawNode( + commandbuffer = commandbuffer, + pipeline = pipeline, + nodeId = nodeId, + transform = rotate(PI / 2, Z) + ) # cleanup checkVkResult vkDeviceWaitIdle(vulkan.device)