1 files changed, 14 insertions, 14 deletions
diff --git a/src/gpu/pipeline_builder.h b/src/gpu/pipeline_builder.h
index a258b49..937c55f 100644
--- a/src/gpu/pipeline_builder.h
+++ b/src/gpu/pipeline_builder.h
@@ -15,6 +15,7 @@ typedef struct WGPUShaderModuleImpl* WGPUShaderModule;
 
 #include "gpu/shader_composer.h"
 #include "platform/platform.h"
+#include "util/fatal_error.h"
 
 class RenderPipelineBuilder {
   WGPUDevice device_;
@@ -38,17 +39,18 @@ class RenderPipelineBuilder {
 
   RenderPipelineBuilder& shader(const char* wgsl, bool compose = true) {
     shader_text_ = compose ? ShaderComposer::Get().Compose({}, wgsl) : wgsl;
-    // Headless mode: skip shader module creation
-    if (device_ != nullptr) {
-      WGPUShaderSourceWGSL wgsl_src{};
-      wgsl_src.chain.sType = WGPUSType_ShaderSourceWGSL;
-      wgsl_src.code = str_view(shader_text_.c_str());
-      WGPUShaderModuleDescriptor shader_desc{};
-      shader_desc.nextInChain = &wgsl_src.chain;
-      shader_module_ = wgpuDeviceCreateShaderModule(device_, &shader_desc);
-      desc_.vertex.module = shader_module_;
-      desc_.vertex.entryPoint = str_view("vs_main");
+    // Headless mode: skip shader module creation (compiled out in STRIP_ALL)
+    if (device_ == nullptr) {
+      return *this;
     }
+    WGPUShaderSourceWGSL wgsl_src{};
+    wgsl_src.chain.sType = WGPUSType_ShaderSourceWGSL;
+    wgsl_src.code = str_view(shader_text_.c_str());
+    WGPUShaderModuleDescriptor shader_desc{};
+    shader_desc.nextInChain = &wgsl_src.chain;
+    shader_module_ = wgpuDeviceCreateShaderModule(device_, &shader_desc);
+    desc_.vertex.module = shader_module_;
+    desc_.vertex.entryPoint = str_view("vs_main");
     return *this;
   }
 
@@ -88,10 +90,8 @@ class RenderPipelineBuilder {
   }
 
   WGPURenderPipeline build() {
-    // Headless mode: skip pipeline creation
-    if (device_ == nullptr) {
-      return nullptr;
-    }
+    // Headless mode: skip pipeline creation (compiled out in STRIP_ALL)
+    HEADLESS_RETURN_VAL_IF_NULL(device_, nullptr);
 
     color_.writeMask = WGPUColorWriteMask_All;
     if (has_blend_)