From 3f322c49bc5cd16f626c7532f4271148967d3ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 1 Oct 2024 08:41:50 +0200 Subject: [PATCH] std.Target: Remove Os.Tag.shadermodel. This was a leftover from the Cpu.Arch.dxil removal. --- lib/compiler/aro/aro/target.zig | 1 - lib/std/Target.zig | 8 +------- src/codegen/llvm.zig | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/compiler/aro/aro/target.zig b/lib/compiler/aro/aro/target.zig index 5b05e5c9b6..7147a57a11 100644 --- a/lib/compiler/aro/aro/target.zig +++ b/lib/compiler/aro/aro/target.zig @@ -652,7 +652,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 { .tvos => "tvos", .watchos => "watchos", .driverkit => "driverkit", - .shadermodel => "shadermodel", .visionos => "xros", .serenity => "serenity", .bridgeos => "bridgeos", diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 4b58b2e7a3..a542fd7817 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -66,13 +66,13 @@ pub const Os = struct { nvcl, opencl, opengl, - shadermodel, vulkan, // LLVM tags deliberately omitted: // - darwin // - kfreebsd // - nacl + // - shadermodel pub inline fn isDarwin(tag: Tag) bool { return switch (tag) { @@ -178,7 +178,6 @@ pub const Os = struct { .hermit, .hurd, .emscripten, - .shadermodel, .uefi, .opencl, // TODO: OpenCL versions .opengl, // TODO: GLSL versions @@ -410,7 +409,6 @@ pub const Os = struct { .hermit, .hurd, .emscripten, - .shadermodel, .uefi, .opencl, // TODO: OpenCL versions .opengl, // TODO: GLSL versions @@ -615,7 +613,6 @@ pub const Os = struct { .hurd, .wasi, .emscripten, - .shadermodel, .uefi, .opencl, .opengl, @@ -742,7 +739,6 @@ pub const Abi = enum { .watchos, .visionos, .driverkit, - .shadermodel, .solaris, .illumos, .serenity, @@ -1879,7 +1875,6 @@ pub const DynamicLinker = struct { .amdpal, .hermit, .hurd, - .shadermodel, => none, }; } @@ -2372,7 +2367,6 @@ pub fn cTypeBitSize(target: Target, c_type: CType) u16 { .hermit, .hurd, .opengl, - .shadermodel, => @panic("TODO specify the C integer and float type sizes for this OS"), } } diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index f400334787..2c13899bae 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -134,7 +134,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 { .tvos => "tvos", .watchos => "watchos", .driverkit => "driverkit", - .shadermodel => "shadermodel", .visionos => "xros", .serenity => "serenity", .vulkan => "vulkan", @@ -223,7 +222,6 @@ pub fn targetOs(os_tag: std.Target.Os.Tag) llvm.OSType { .wasi => .WASI, .emscripten => .Emscripten, .driverkit => .DriverKit, - .shadermodel => .ShaderModel, .vulkan => .Vulkan, .serenity => .Serenity, .bridgeos => .BridgeOS,