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

CopyTextureForBrowser(): Fix macro declaration 

This is fixup for the
https://dawn-review.googlesource.com/c/dawn/+/54800
where the macre was not properly declared.
Clang doesn't claims about it, but GCC does.
The errors example for GCC 9.3.0:
/dawn/src/dawn_native/CopyTextureForBrowserHelper.cpp:40:5:
error: unterminated raw string
   40 |     R"(
      |     ^
/dawn/src/dawn_native/CopyTextureForBrowserHelper.cpp:46:6:
warning: missing terminating " character
   46 |     )"
      |      ^

Bug: chromium:1217153, chromium:819294
Change-Id: I47aa2dac37d9dfa7c02532caeb3341edd22fcd07
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/56066
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2021-06-28 16:57:13 +00:00 committed by Dawn LUCI CQ
parent 97a4f05bf9
commit a68489fb83
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dawn_native/CopyTextureForBrowserHelper.cpp
View File

@ -36,14 +36,12 @@ namespace dawn_native {
// TODO(crbug.com/1221110): Remove this header macro by merging vertex and // TODO(crbug.com/1221110): Remove this header macro by merging vertex and
// fragment shaders into one shader source. Now it blocks by // fragment shaders into one shader source. Now it blocks by
// crbug.com/dawn/947 and crbug.com/tint/915 // crbug.com/dawn/947 and crbug.com/tint/915
#define HEADER \ #define HEADER \
R"( " [[block]] struct Uniforms {\n" \
[[block]] struct Uniforms { " u_scale: vec2<f32>;\n" \
u_scale: vec2<f32>; " u_offset: vec2<f32>;\n" \
u_offset: vec2<f32>; " u_alphaOp: u32;\n" \
u_alphaOp: u32; " };\n"
};
)"
static const char sCopyTextureForBrowserVertex[] = HEADER R"( static const char sCopyTextureForBrowserVertex[] = HEADER R"(
[[binding(0), group(0)]] var<uniform> uniforms : Uniforms; [[binding(0), group(0)]] var<uniform> uniforms : Uniforms;