diff options
| -rw-r--r-- | src/app/test_demo.cc | 4 | ||||
| -rw-r--r-- | tools/cnn_test.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/app/test_demo.cc b/src/app/test_demo.cc index ff2c105..434c376 100644 --- a/src/app/test_demo.cc +++ b/src/app/test_demo.cc @@ -231,9 +231,9 @@ int main(int argc, char** argv) { // Add CNN post-processing effect based on version flag if (g_cnn_version == 1) { - CNNEffectParams params; + CNNv1EffectParams params; params.blend_amount = 1.0f; - auto* cnn = new CNNEffect(*gpu_ctx, params); + auto* cnn = new CNNv1Effect(*gpu_ctx, params); cnn->set_beat_modulation(true, 1.0f); gpu_add_custom_effect(cnn, 0.0f, 99999.0f, 10); } else if (g_cnn_version == 2) { diff --git a/tools/cnn_test.cc b/tools/cnn_test.cc index 137d235..25e27e8 100644 --- a/tools/cnn_test.cc +++ b/tools/cnn_test.cc @@ -1332,7 +1332,7 @@ int main(int argc, char** argv) { const WGPUBufferDescriptor layer_params_desc = { .usage = WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst, - .size = sizeof(CNNLayerParams), + .size = sizeof(CNNv1LayerParams), }; WGPUBuffer layer_params_buffer = wgpuDeviceCreateBuffer(device, &layer_params_desc); @@ -1389,7 +1389,7 @@ int main(int argc, char** argv) { wgpuQueueWriteBuffer(queue, common_uniform_buffer, 0, &common_u, sizeof(common_u)); - CNNLayerParams layer_params = { + CNNv1LayerParams layer_params = { .layer_index = layer, .blend_amount = (layer == NUM_LAYERS - 1) ? args.blend : 1.0f, // Only final layer @@ -1404,7 +1404,7 @@ int main(int argc, char** argv) { .sampler(0, sampler) .texture(1, current_input) .buffer(2, common_uniform_buffer, sizeof(CommonPostProcessUniforms)) - .buffer(3, layer_params_buffer, sizeof(CNNLayerParams)) + .buffer(3, layer_params_buffer, sizeof(CNNv1LayerParams)) .texture(4, original_view) .build(device, bgl); |