zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

examples: fix cubemap compilation

Browse source 
self-hosted compiler picked up alignment issues better.

fixes hexops/mach#578

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-10-14 11:20:43 -07:00
parent 78dfa2df6b
commit 78cf48e022
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/cubemap/main.zig
View file

@ -175,7 +175,7 @@ pub fn init(app: *App, core: *mach.Core) !void {
// Map a section of the staging buffer // Map a section of the staging buffer
var staging_map = staging_buff[i].getMappedRange(u32, 0, @intCast(u64, images[i].width) * @intCast(u64, images[i].height)); var staging_map = staging_buff[i].getMappedRange(u32, 0, @intCast(u64, images[i].width) * @intCast(u64, images[i].height));
// Copy the image data into the mapped buffer // Copy the image data into the mapped buffer
std.mem.copy(u32, staging_map.?, @ptrCast([]u32, pixels)); std.mem.copy(u32, staging_map.?, @ptrCast([]u32, @alignCast(@alignOf([]u32), pixels)));
// And release the mapping // And release the mapping
staging_buff[i].unmap(); staging_buff[i].unmap();
}, },
@ -184,7 +184,7 @@ pub fn init(app: *App, core: *mach.Core) !void {
// In this case, we have to convert the data to rgba32 first // In this case, we have to convert the data to rgba32 first
const data = try rgb24ToRgba32(core.allocator, pixels); const data = try rgb24ToRgba32(core.allocator, pixels);
defer data.deinit(core.allocator); defer data.deinit(core.allocator);
std.mem.copy(u32, staging_map.?, @ptrCast([]u32, data.rgba32)); std.mem.copy(u32, staging_map.?, @ptrCast([]u32, @alignCast(@alignOf([]u32), data.rgba32)));
staging_buff[i].unmap(); staging_buff[i].unmap();
}, },
else => @panic("unsupported image color format"), else => @panic("unsupported image color format"),