From a7a6ecdd453f7a6e9afd170d91cc3fcd94cf42b5 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 6 Apr 2024 13:25:12 -0700 Subject: [PATCH] examples/custom-renderer: correct packed struct -> extern struct Signed-off-by: Stephen Gutekanst --- examples/custom-renderer/Renderer.zig | 7 +++---- examples/custom-renderer/shader.wgsl | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/custom-renderer/Renderer.zig b/examples/custom-renderer/Renderer.zig index de5f7caf..1cd87568 100644 --- a/examples/custom-renderer/Renderer.zig +++ b/examples/custom-renderer/Renderer.zig @@ -33,9 +33,8 @@ pub const global_events = .{ .tick = .{ .handler = tick }, }; -// TODO(important): this shouldn't be a packed struct, it should be extern. -const UniformBufferObject = packed struct { - offset: Vec3.Vector, +const UniformBufferObject = extern struct { + offset: Vec3, scale: f32, }; @@ -146,7 +145,7 @@ fn tick( _ = id; const ubo = UniformBufferObject{ - .offset = position.v, + .offset = position, .scale = scale, }; encoder.writeBuffer(renderer.state().uniform_buffer, uniform_offset * num_entities, &[_]UniformBufferObject{ubo}); diff --git a/examples/custom-renderer/shader.wgsl b/examples/custom-renderer/shader.wgsl index 1ee56549..edd66098 100644 --- a/examples/custom-renderer/shader.wgsl +++ b/examples/custom-renderer/shader.wgsl @@ -1,6 +1,6 @@ // TODO(important): docs struct Uniform { - pos: vec3, + pos: vec4, scale: f32, };