From 9f22c9ca3a77ae258f45b2753beb69c17802031c Mon Sep 17 00:00:00 2001 From: jacob Date: Thu, 5 Feb 2026 17:54:27 -0600 Subject: [PATCH] echo shader name on build error --- src/meta/meta.c | 8 +++++++- src/meta/meta.h | 1 + src/pp/pp_shared.cgh | 12 +++++++----- src/pp/pp_vis/pp_vis_core.c | 5 +++-- src/pp/pp_vis/pp_vis_gpu.g | 4 ++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/meta/meta.c b/src/meta/meta.c index b88b10bd..539c2da9 100644 --- a/src/meta/meta.c +++ b/src/meta/meta.c @@ -894,6 +894,7 @@ void M_BuildEntryPoint(WaveLaneCtx *lane) ); OS_CommandResult cmd_result = OS_RunCommand(perm, compile_cmd); + gpu_obj->name = shader_name; gpu_obj->output = cmd_result.output; gpu_obj->return_code = cmd_result.code; @@ -995,7 +996,12 @@ void M_BuildEntryPoint(WaveLaneCtx *lane) } if (disp_obj) { - gpu_obj_output = TrimWhitespace(disp_obj->output); + gpu_obj_output = StringF( + perm, + "%F\n%F", + FmtString(disp_obj->name), + FmtString(TrimWhitespace(disp_obj->output)) + ); } } String embed_obj_output = Zi; diff --git a/src/meta/meta.h b/src/meta/meta.h index 5d23f1b5..8ca7c20f 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -109,6 +109,7 @@ Struct(M_ResDir) Struct(M_GpuObj) { + String name; String output; i32 return_code; }; diff --git a/src/pp/pp_shared.cgh b/src/pp/pp_shared.cgh index 8d09f9a7..2c5a82f5 100644 --- a/src/pp/pp_shared.cgh +++ b/src/pp/pp_shared.cgh @@ -1,17 +1,19 @@ -#define P_WorldPitch 64.0 - #define P_CellsPerMeter 32.0 #define P_CellsPerSqMeter (P_CellsPerMeter * P_CellsPerMeter) #define P_TilesPerMeter 2.0 #define P_TilesPerSqMeter (V_TilesPerMeter * V_TilesPerMeter) +#define P_WorldPitch 64.0 +#define P_TilesPitch (P_WorldPitch * P_TilesPerMeter) +#define P_CellsPitch (P_WorldPitch * P_CellsPerMeter) + +#define P_TilesCount (P_TilesPitch * P_TilesPitch) +#define P_CellsCount (P_CellsPitch * P_TilesPitch) + //////////////////////////////////////////////////////////// //~ Tile types -#define P_TilesPitch (P_WorldPitch * P_TilesPerMeter) -#define P_TilesCount (P_TilesPitch * P_TilesPitch) - #define P_TilesXList(X) \ X(Empty) \ X(Wall) \ diff --git a/src/pp/pp_vis/pp_vis_core.c b/src/pp/pp_vis/pp_vis_core.c index ee19026d..8ec02328 100644 --- a/src/pp/pp_vis/pp_vis_core.c +++ b/src/pp/pp_vis/pp_vis_core.c @@ -387,7 +387,7 @@ void V_TickForever(WaveLaneCtx *lane) f32 smooth_remote_buffered_ticks_target = 2; Vec2I32 tiles_dims = VEC2I32(P_TilesPitch, P_TilesPitch); - Vec2I32 cells_dims = VEC2I32(P_CellsPerMeter * P_WorldPitch, P_CellsPerMeter * P_WorldPitch); + Vec2I32 cells_dims = VEC2I32(P_CellsPitch, P_CellsPitch); // Init gpu state G_ResourceHandle gpu_tiles_res = Zi; @@ -2758,7 +2758,7 @@ void V_TickForever(WaveLaneCtx *lane) ++panel->windows_count; ++V.windows_count; } - panel->active_window_idx = 1; + panel->active_window_idx = 2; } { @@ -3353,6 +3353,7 @@ void V_TickForever(WaveLaneCtx *lane) if (window->is_prefab_window) { + } } UI_PopCP(UI_TopCP()); diff --git a/src/pp/pp_vis/pp_vis_gpu.g b/src/pp/pp_vis/pp_vis_gpu.g index 5f4ed8e4..473ee795 100644 --- a/src/pp/pp_vis/pp_vis_gpu.g +++ b/src/pp/pp_vis/pp_vis_gpu.g @@ -18,9 +18,8 @@ Vec4 V_DryColor(Vec4 color, f32 dryness) } //////////////////////////////////////////////////////////// -//~ Utility shaders +//~ Prepare frame -//- Prepare shade ComputeShader2D(V_PrepareShadeCS, 8, 8) { V_SharedFrame frame = G_Dereference(V_ShaderConst_Frame)[0]; @@ -39,6 +38,7 @@ ComputeShader2D(V_PrepareCellsCS, 8, 8) V_SharedFrame frame = G_Dereference(V_ShaderConst_Frame)[0]; RWTexture2D cells = G_Dereference(frame.cells); RWTexture2D drynesses = G_Dereference(frame.drynesses); + Vec2 cells_pos = SV_DispatchThreadID + 0.5; if (all(cells_pos < countof(cells))) {