diff options
Diffstat (limited to 'cnn_v3/src')
| -rw-r--r-- | cnn_v3/src/gbuf_deferred_effect.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cnn_v3/src/gbuf_deferred_effect.cc b/cnn_v3/src/gbuf_deferred_effect.cc index 1adae5e..de6bd29 100644 --- a/cnn_v3/src/gbuf_deferred_effect.cc +++ b/cnn_v3/src/gbuf_deferred_effect.cc @@ -37,12 +37,13 @@ GBufDeferredEffect::GBufDeferredEffect(const GpuContext& ctx, : Effect(ctx, inputs, outputs, start_time, end_time) { HEADLESS_RETURN_IF_NULL(ctx_.device); - WGPUBindGroupLayoutEntry entries[2] = { + WGPUBindGroupLayoutEntry entries[3] = { bgl_uint_tex(0), + bgl_uint_tex(1), bgl_uniform(2, sizeof(GBufDeferredUniforms)), }; WGPUBindGroupLayoutDescriptor bgl_desc = {}; - bgl_desc.entryCount = 2; + bgl_desc.entryCount = 3; bgl_desc.entries = entries; WGPUBindGroupLayout bgl = wgpuDeviceCreateBindGroupLayout(ctx_.device, &bgl_desc); @@ -89,6 +90,7 @@ void GBufDeferredEffect::render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params, NodeRegistry& nodes) { WGPUTextureView feat0_view = nodes.get_view(input_nodes_[0]); + WGPUTextureView feat1_view = nodes.get_view(input_nodes_[1]); WGPUTextureView output_view = nodes.get_view(output_nodes_[0]); // Upload resolution uniform into the base class uniforms buffer (first 8 bytes). @@ -101,16 +103,18 @@ void GBufDeferredEffect::render(WGPUCommandEncoder encoder, WGPUBindGroupLayout bgl = wgpuRenderPipelineGetBindGroupLayout(pipeline_.get(), 0); - WGPUBindGroupEntry bg_entries[2] = {}; + WGPUBindGroupEntry bg_entries[3] = {}; bg_entries[0].binding = 0; bg_entries[0].textureView = feat0_view; - bg_entries[1].binding = 2; - bg_entries[1].buffer = uniforms_buffer_.get().buffer; - bg_entries[1].size = sizeof(GBufDeferredUniforms); + bg_entries[1].binding = 1; + bg_entries[1].textureView = feat1_view; + bg_entries[2].binding = 2; + bg_entries[2].buffer = uniforms_buffer_.get().buffer; + bg_entries[2].size = sizeof(GBufDeferredUniforms); WGPUBindGroupDescriptor bg_desc = {}; bg_desc.layout = bgl; - bg_desc.entryCount = 2; + bg_desc.entryCount = 3; bg_desc.entries = bg_entries; bind_group_.replace(wgpuDeviceCreateBindGroup(ctx_.device, &bg_desc)); wgpuBindGroupLayoutRelease(bgl); |