encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
James Price 2022-05-02 14:53:36 +00:00
parent 8aff0ed684
commit adc97421ae
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dawn/native/CopyTextureForBrowserHelper.cpp
View File

@ -39,32 +39,32 @@ namespace {
static const char sCopyTextureForBrowserShader[] = R"( static const char sCopyTextureForBrowserShader[] = R"(
struct GammaTransferParams { struct GammaTransferParams {
G: f32; G: f32,
A: f32; A: f32,
B: f32; B: f32,
C: f32; C: f32,
D: f32; D: f32,
E: f32; E: f32,
F: f32; F: f32,
padding: u32; padding: u32,
}; };
struct Uniforms { // offset align size struct Uniforms { // offset align size
scale: vec2<f32>; // 0 8 8 scale: vec2<f32>, // 0 8 8
offset: vec2<f32>; // 8 8 8 offset: vec2<f32>, // 8 8 8
steps_mask: u32; // 16 4 4 steps_mask: u32, // 16 4 4
// implicit padding; // 20 12 // implicit padding; // 20 12
conversion_matrix: mat3x3<f32>; // 32 16 48 conversion_matrix: mat3x3<f32>, // 32 16 48
gamma_decoding_params: GammaTransferParams; // 80 4 32 gamma_decoding_params: GammaTransferParams, // 80 4 32
gamma_encoding_params: GammaTransferParams; // 112 4 32 gamma_encoding_params: GammaTransferParams, // 112 4 32
gamma_decoding_for_dst_srgb_params: GammaTransferParams; // 144 4 32 gamma_decoding_for_dst_srgb_params: GammaTransferParams, // 144 4 32
}; };
@binding(0) @group(0) var<uniform> uniforms : Uniforms; @binding(0) @group(0) var<uniform> uniforms : Uniforms;
struct VertexOutputs { struct VertexOutputs {
@location(0) texcoords : vec2<f32>; @location(0) texcoords : vec2<f32>,
@builtin(position) position : vec4<f32>; @builtin(position) position : vec4<f32>,
}; };
// Chromium uses unified equation to construct gamma decoding function // Chromium uses unified equation to construct gamma decoding function