From adc97421aee9e872d15048158d743520382aa329 Mon Sep 17 00:00:00 2001 From: James Price Date: Mon, 2 May 2022 14:53:36 +0000 Subject: [PATCH] wgsl: Use commas for structs in helper shaders Bug: tint:1475 Change-Id: I27a4bd060d66ad53a6a9793f012034cf19973dd4 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88462 Reviewed-by: Ben Clayton Kokoro: Kokoro --- .../native/CopyTextureForBrowserHelper.cpp | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/dawn/native/CopyTextureForBrowserHelper.cpp b/src/dawn/native/CopyTextureForBrowserHelper.cpp index 5f04014818..b2368158f8 100644 --- a/src/dawn/native/CopyTextureForBrowserHelper.cpp +++ b/src/dawn/native/CopyTextureForBrowserHelper.cpp @@ -39,32 +39,32 @@ namespace { static const char sCopyTextureForBrowserShader[] = R"( struct GammaTransferParams { - G: f32; - A: f32; - B: f32; - C: f32; - D: f32; - E: f32; - F: f32; - padding: u32; + G: f32, + A: f32, + B: f32, + C: f32, + D: f32, + E: f32, + F: f32, + padding: u32, }; struct Uniforms { // offset align size - scale: vec2; // 0 8 8 - offset: vec2; // 8 8 8 - steps_mask: u32; // 16 4 4 + scale: vec2, // 0 8 8 + offset: vec2, // 8 8 8 + steps_mask: u32, // 16 4 4 // implicit padding; // 20 12 - conversion_matrix: mat3x3; // 32 16 48 - gamma_decoding_params: GammaTransferParams; // 80 4 32 - gamma_encoding_params: GammaTransferParams; // 112 4 32 - gamma_decoding_for_dst_srgb_params: GammaTransferParams; // 144 4 32 + conversion_matrix: mat3x3, // 32 16 48 + gamma_decoding_params: GammaTransferParams, // 80 4 32 + gamma_encoding_params: GammaTransferParams, // 112 4 32 + gamma_decoding_for_dst_srgb_params: GammaTransferParams, // 144 4 32 }; @binding(0) @group(0) var uniforms : Uniforms; struct VertexOutputs { - @location(0) texcoords : vec2; - @builtin(position) position : vec4; + @location(0) texcoords : vec2, + @builtin(position) position : vec4, }; // Chromium uses unified equation to construct gamma decoding function