From 96ad6503d938cca8741d24da4e2f5a9a31d559d7 Mon Sep 17 00:00:00 2001
From: Dominic <4678790+dweiller@users.noreply.github.com>
Date: Fri, 10 Mar 2023 13:49:40 +1100
Subject: [PATCH] core: fix usage of std_options for log_level and
 log_scope_levels (#717)

Co-authored-by: dweiller <4678790+dweiller@users.noreplay.github.com>
---
 libs/core/src/platform/native/entry.zig | 17 +++++++++++++++--
 libs/core/src/platform/wasm/entry.zig   | 13 +++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/libs/core/src/platform/native/entry.zig b/libs/core/src/platform/native/entry.zig
index 0eb922fe..33bef41d 100644
--- a/libs/core/src/platform/native/entry.zig
+++ b/libs/core/src/platform/native/entry.zig
@@ -4,8 +4,21 @@ const App = @import("app").App;
 const util = @import("util.zig");
 
 pub const GPUInterface = gpu.dawn.Interface;
-pub const scope_levels = if (@hasDecl(App, "scope_levels")) App.scope_levels else [0]std.log.ScopeLevel{};
-pub const log_level = if (@hasDecl(App, "log_level")) App.log_level else std.log.default_level;
+
+const app_std_options = if (@hasDecl(App, "std_options")) App.std_options else struct {};
+
+pub const std_options = struct {
+    pub const log_level = if (@hasDecl(app_std_options, "log_level"))
+        app_std_options.log_level
+    else
+        std.log.default_level;
+
+    pub const log_scope_levels = if (@hasDecl(App, "log_scope_levels"))
+        app_std_options.log_scope_levels
+    else
+        &[0]std.log.ScopeLevel{};
+};
+
 pub fn main() !void {
     gpu.Impl.init();
     _ = gpu.Export(GPUInterface);
diff --git a/libs/core/src/platform/wasm/entry.zig b/libs/core/src/platform/wasm/entry.zig
index 905d83b2..7d752165 100644
--- a/libs/core/src/platform/wasm/entry.zig
+++ b/libs/core/src/platform/wasm/entry.zig
@@ -4,8 +4,7 @@ const App = @import("app").App;
 const js = @import("js.zig");
 
 pub const GPUInterface = gpu.StubInterface;
-pub const log_level = if (@hasDecl(App, "log_level")) App.log_level else std.log.default_level;
-pub const scope_levels = if (@hasDecl(App, "scope_levels")) App.scope_levels else [0]std.log.ScopeLevel{};
+const app_std_options = if (@hasDecl(App, "std_options")) App.std_options else struct {};
 
 var app: App = undefined;
 export fn wasmInit() void {
@@ -41,6 +40,16 @@ pub const std_options = struct {
         writer.print(message_level.asText() ++ prefix ++ format ++ "\n", args) catch return;
         js.machLogFlush();
     }
+
+    pub const log_level = if (@hasDecl(app_std_options, "log_level"))
+        app_std_options.log_level
+    else
+        std.log.default_level;
+
+    pub const log_scope_levels = if (@hasDecl(app_std_options, "log_scope_levels"))
+        app_std_options.log_scope_levels
+    else
+        &[0]std.log.ScopeLevel{};
 };
 
 pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {