diff options
Diffstat (limited to 'tools/cnn_test.cc')
| -rw-r--r-- | tools/cnn_test.cc | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/tools/cnn_test.cc b/tools/cnn_test.cc index b4a4bdc..1d736d9 100644 --- a/tools/cnn_test.cc +++ b/tools/cnn_test.cc @@ -700,15 +700,8 @@ static bool process_cnn_v2(WGPUDevice device, WGPUQueue queue, wgpuQueueWriteBuffer(queue, weights_buffer, 0, weights_data + weights_offset, weights_only_size); // Create input view - const WGPUTextureViewDescriptor view_desc = { - .format = WGPUTextureFormat_BGRA8Unorm, - .dimension = WGPUTextureViewDimension_2D, - .baseMipLevel = 0, - .mipLevelCount = 1, - .baseArrayLayer = 0, - .arrayLayerCount = 1, - }; - WGPUTextureView input_view = wgpuTextureCreateView(input_texture, &view_desc); + WGPUTextureView input_view = + gpu_create_texture_view_2d(input_texture, WGPUTextureFormat_BGRA8Unorm); // Create static features texture (RGBA32Uint) const WGPUTextureDescriptor static_desc = { @@ -1269,15 +1262,8 @@ int main(int argc, char** argv) { printf("Using CNN v1 (render pipeline architecture)\n"); // Create input texture view - const WGPUTextureViewDescriptor view_desc = { - .format = WGPUTextureFormat_BGRA8Unorm, - .dimension = WGPUTextureViewDimension_2D, - .baseMipLevel = 0, - .mipLevelCount = 1, - .baseArrayLayer = 0, - .arrayLayerCount = 1, - }; - WGPUTextureView input_view = wgpuTextureCreateView(input_texture, &view_desc); + WGPUTextureView input_view = + gpu_create_texture_view_2d(input_texture, WGPUTextureFormat_BGRA8Unorm); WGPUTextureView original_view = input_view; // Keep reference to original // Create CNN pipelines (different formats for intermediate vs final) @@ -1333,17 +1319,11 @@ int main(int argc, char** argv) { }; // Create views for intermediate textures (RGBA16Float) - const WGPUTextureViewDescriptor intermediate_view_desc = { - .format = WGPUTextureFormat_RGBA16Float, - .dimension = WGPUTextureViewDimension_2D, - .baseMipLevel = 0, - .mipLevelCount = 1, - .baseArrayLayer = 0, - .arrayLayerCount = 1, - }; WGPUTextureView intermediate_views[2] = { - wgpuTextureCreateView(intermediate_textures[0], &intermediate_view_desc), - wgpuTextureCreateView(intermediate_textures[1], &intermediate_view_desc), + gpu_create_texture_view_2d(intermediate_textures[0], + WGPUTextureFormat_RGBA16Float), + gpu_create_texture_view_2d(intermediate_textures[1], + WGPUTextureFormat_RGBA16Float), }; // Get sampler |