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

gpu: workaround stage2 usingnamespace bug

Browse source 
See ziglang/zig#12429

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-08-12 10:47:59 -07:00
parent 9a79da0f69
commit 27df1e7ca8
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gpu/src/main.zig
View file

@ -1,13 +1,5 @@
const std = @import("std"); const std = @import("std");
pub const array_layer_count_undef = 0xffffffff;
pub const copy_stride_undef = 0xffffffff;
pub const limit_u32_undef = 0xffffffff;
pub const limit_u64_undef = 0xffffffffffffffff;
pub const mip_level_count_undef = 0xffffffff;
pub const whole_map_size = std.math.maxInt(usize);
pub const whole_size = 0xffffffffffffffff;
pub usingnamespace @import("adapter.zig"); pub usingnamespace @import("adapter.zig");
pub usingnamespace @import("bind_group.zig"); pub usingnamespace @import("bind_group.zig");
pub usingnamespace @import("bind_group_layout.zig"); pub usingnamespace @import("bind_group_layout.zig");

6
gpu/src/texture.zig
View file

@ -3,7 +3,7 @@ const ChainedStruct = @import("types.zig").ChainedStruct;
const TextureView = @import("texture_view.zig").TextureView; const TextureView = @import("texture_view.zig").TextureView;
const Extent3D = @import("types.zig").Extent3D; const Extent3D = @import("types.zig").Extent3D;
const Impl = @import("interface.zig").Impl; const Impl = @import("interface.zig").Impl;
const copy_stride_undef = @import("main.zig").copy_stride_undef; const types = @import("types.zig");
pub const Texture = opaque { pub const Texture = opaque {
pub const Aspect = enum(u32) { pub const Aspect = enum(u32) {
@ -169,8 +169,8 @@ pub const Texture = opaque {
pub const DataLayout = extern struct { pub const DataLayout = extern struct {
next_in_chain: ?*const ChainedStruct = null, next_in_chain: ?*const ChainedStruct = null,
offset: u64 = 0, offset: u64 = 0,
bytes_per_row: u32 = copy_stride_undef, bytes_per_row: u32 = types.copy_stride_undef,
rows_per_image: u32 = copy_stride_undef, rows_per_image: u32 = types.copy_stride_undef,
}; };
pub const Descriptor = extern struct { pub const Descriptor = extern struct {

7
gpu/src/texture_view.zig
View file

@ -1,8 +1,7 @@
const ChainedStruct = @import("types.zig").ChainedStruct; const ChainedStruct = @import("types.zig").ChainedStruct;
const Texture = @import("texture.zig").Texture; const Texture = @import("texture.zig").Texture;
const Impl = @import("interface.zig").Impl; const Impl = @import("interface.zig").Impl;
const mip_level_count_undef = @import("main.zig").mip_level_count_undef; const types = @import("types.zig");
const array_layer_count_undef = @import("main.zig").array_layer_count_undef;
pub const TextureView = opaque { pub const TextureView = opaque {
pub const Dimension = enum(u32) { pub const Dimension = enum(u32) {
@ -21,9 +20,9 @@ pub const TextureView = opaque {
format: Texture.Format = .undef, format: Texture.Format = .undef,
dimension: Dimension = .dimension_undef, dimension: Dimension = .dimension_undef,
base_mip_level: u32 = 0, base_mip_level: u32 = 0,
mip_level_count: u32 = mip_level_count_undef, mip_level_count: u32 = types.mip_level_count_undef,
base_array_layer: u32 = 0, base_array_layer: u32 = 0,
array_layer_count: u32 = array_layer_count_undef, array_layer_count: u32 = types.array_layer_count_undef,
aspect: Texture.Aspect = .all, aspect: Texture.Aspect = .all,
}; };

10
gpu/src/types.zig
View file

@ -6,8 +6,14 @@ const Buffer = @import("buffer.zig").Buffer;
const ShaderModule = @import("shader_module.zig").ShaderModule; const ShaderModule = @import("shader_module.zig").ShaderModule;
const QuerySet = @import("query_set.zig").QuerySet; const QuerySet = @import("query_set.zig").QuerySet;
const Surface = @import("surface.zig").Surface; const Surface = @import("surface.zig").Surface;
const limit_u32_undef = @import("main.zig").limit_u32_undef;
const limit_u64_undef = @import("main.zig").limit_u64_undef; pub const array_layer_count_undef = 0xffffffff;
pub const copy_stride_undef = 0xffffffff;
pub const limit_u32_undef = 0xffffffff;
pub const limit_u64_undef = 0xffffffffffffffff;
pub const mip_level_count_undef = 0xffffffff;
pub const whole_map_size = std.math.maxInt(usize);
pub const whole_size = 0xffffffffffffffff;
/// Generic function pointer type, used for returning API function pointers. Must be /// Generic function pointer type, used for returning API function pointers. Must be
/// cast to the right `fn (...) callconv(.C) T` type before use. /// cast to the right `fn (...) callconv(.C) T` type before use.