1 files changed, 14 insertions, 10 deletions
diff --git a/src/gpu/effects/circle_mask_effect.cc b/src/gpu/effects/circle_mask_effect.cc
index 5b71086..ca80cf9 100644
--- a/src/gpu/effects/circle_mask_effect.cc
+++ b/src/gpu/effects/circle_mask_effect.cc
@@ -3,6 +3,7 @@
 // Generates circular mask and renders green background outside circle.
 
 #include "gpu/effects/circle_mask_effect.h"
+#include "gpu/effects/shader_composer.h"
 #include "generated/assets.h"
 
 CircleMaskEffect::CircleMaskEffect(const GpuContext& ctx, float radius)
@@ -30,9 +31,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
 
   demo_->register_auxiliary_texture("circle_mask", width, height);
 
-  compute_uniforms_.init(ctx_.device);
   compute_params_.init(ctx_.device);
-  render_uniforms_.init(ctx_.device);
 
   WGPUSamplerDescriptor sampler_desc = {};
   sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
@@ -49,9 +48,12 @@ void CircleMaskEffect::init(MainSequence* demo) {
   const char* render_shader = (const char*)GetAsset(
       AssetId::ASSET_CIRCLE_MASK_RENDER_SHADER, &render_size);
 
+  // Compose shaders to resolve #include directives
+  std::string composed_compute = ShaderComposer::Get().Compose({}, compute_shader);
+
   WGPUShaderSourceWGSL compute_wgsl = {};
   compute_wgsl.chain.sType = WGPUSType_ShaderSourceWGSL;
-  compute_wgsl.code = str_view(compute_shader);
+  compute_wgsl.code = str_view(composed_compute.c_str());
 
   WGPUShaderModuleDescriptor compute_desc = {};
   compute_desc.nextInChain = &compute_wgsl.chain;
@@ -82,11 +84,11 @@ void CircleMaskEffect::init(MainSequence* demo) {
 
   const WGPUBindGroupEntry compute_entries[] = {
       {.binding = 0,
-       .buffer = compute_uniforms_.get().buffer,
+       .buffer = uniforms_.get().buffer,
        .size = sizeof(CommonPostProcessUniforms)},
       {.binding = 1,
        .buffer = compute_params_.get().buffer,
-       .size = sizeof(EffectParams)},
+       .size = sizeof(CircleMaskParams)},
   };
   const WGPUBindGroupDescriptor compute_bg_desc = {
       .layout = wgpuRenderPipelineGetBindGroupLayout(compute_pipeline_, 0),
@@ -96,9 +98,11 @@ void CircleMaskEffect::init(MainSequence* demo) {
   compute_bind_group_ =
       wgpuDeviceCreateBindGroup(ctx_.device, &compute_bg_desc);
 
+  std::string composed_render = ShaderComposer::Get().Compose({}, render_shader);
+
   WGPUShaderSourceWGSL render_wgsl = {};
   render_wgsl.chain.sType = WGPUSType_ShaderSourceWGSL;
-  render_wgsl.code = str_view(render_shader);
+  render_wgsl.code = str_view(composed_render.c_str());
 
   WGPUShaderModuleDescriptor render_desc = {};
   render_desc.nextInChain = &render_wgsl.chain;
@@ -139,7 +143,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
       {.binding = 0, .textureView = mask_view},
       {.binding = 1, .sampler = mask_sampler_},
       {.binding = 2,
-       .buffer = render_uniforms_.get().buffer,
+       .buffer = uniforms_.get().buffer,
        .size = sizeof(CommonPostProcessUniforms)},
   };
   const WGPUBindGroupDescriptor render_bg_desc = {
@@ -160,9 +164,9 @@ void CircleMaskEffect::compute(WGPUCommandEncoder encoder, float time,
       .beat = beat,
       .audio_intensity = intensity,
   };
-  compute_uniforms_.update(ctx_.queue, uniforms);
+  uniforms_.update(ctx_.queue, uniforms);
 
-  const EffectParams params = {
+  const CircleMaskParams params = {
       .radius = radius_,
   };
   compute_params_.update(ctx_.queue, params);
@@ -199,7 +203,7 @@ void CircleMaskEffect::render(WGPURenderPassEncoder pass, float time,
       .beat = beat,
       .audio_intensity = intensity,
   };
-  render_uniforms_.update(ctx_.queue, uniforms);
+  uniforms_.update(ctx_.queue, uniforms);
 
   wgpuRenderPassEncoderSetPipeline(pass, render_pipeline_);
   wgpuRenderPassEncoderSetBindGroup(pass, 0, render_bind_group_, 0, nullptr);