From 821117fb26d5b18a1b79649e947b1c0ed8438496 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 22 Apr 2022 22:13:05 -0700 Subject: [PATCH] gpu: correct TextureView.Descriptor default values Helps hexops/mach#182 Signed-off-by: Stephen Gutekanst --- gpu/src/TextureView.zig | 9 ++++++--- gpu/src/main.zig | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gpu/src/TextureView.zig b/gpu/src/TextureView.zig index 28bbc40f..b62f5398 100644 --- a/gpu/src/TextureView.zig +++ b/gpu/src/TextureView.zig @@ -25,14 +25,17 @@ pub inline fn setLabel(texture_view: TextureView, label: [:0]const u8) void { texture_view.vtable.setLabel(texture_view.ptr, label); } +const mip_level_count_undefined: u32 = 0xffffffff; +const array_layer_count_undefined: u32 = 0xffffffff; + pub const Descriptor = struct { label: ?[*:0]const u8 = null, format: Texture.Format = .none, - dimension: TextureView.Dimension, + dimension: TextureView.Dimension = .dimension_none, base_mip_level: u32 = 0, - mip_level_count: u32, + mip_level_count: u32 = mip_level_count_undefined, base_array_layer: u32 = 0, - array_layer_count: u32, + array_layer_count: u32 = array_layer_count_undefined, aspect: Texture.Aspect = .all, }; diff --git a/gpu/src/main.zig b/gpu/src/main.zig index f5ace653..91919b38 100644 --- a/gpu/src/main.zig +++ b/gpu/src/main.zig @@ -147,11 +147,9 @@ pub const ColorWriteMask = @import("enums.zig").ColorWriteMask; pub const ShaderStage = @import("enums.zig").ShaderStage; // Constants -const array_layer_count_undefined: u32 = 0xffffffff; const copy_stride_undefined: u32 = 0xffffffff; const limit_u32_undefined: u32 = 0xffffffff; -const limit_u64_undefined: u32 = 0xffffffffffffffff; -const mip_level_count_undefined: u32 = 0xffffffff; +const limit_u64_undefined: u64 = 0xffffffffffffffff; const stride_undefined: u32 = 0xffffffff; const whole_map_size: u32 = std.math.maxInt(c_int); const whole_size: u64 = 0xffffffffffffffff;