From 076a4e58205dfa2bcf5e33cc8718aa4799d46735 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 4 Aug 2020 21:27:58 +0000 Subject: [PATCH] Roll 6 dependencies and bypass changed API usage Roll third_party/glslang/ 3ee5f2f1d..2de6d657d (6 commits) https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang/+log/3ee5f2f1d331..2de6d657dde3 $ git log 3ee5f2f1d..2de6d657d --date=short --no-merges --format='%ad %ae %s' 2020-08-04 john SPV: Standalone; sanity check the client GLSL input semantics option value. 2020-08-04 john SPV: Use more correct SPV-Tools environment, partially addressing #2290 2020-08-04 john SPV: Fix #2363: include trailing newline named text SPV output. 2020-07-03 ShabbyX Use GLSLANG_ANGLE to strip features to what ANGLE requires 2020-07-31 bclayton Revert changes that migrate to `thread_local`. 2020-07-27 dneto Avoid spurious warning about uninit var Created with: roll-dep third_party/glslang Roll third_party/shaderc/ cfacaaffd..c626b912d (1 commit) https://chromium.googlesource.com/external/github.com/google/shaderc/+log/cfacaaffd1fe..c626b912dc45 $ git log cfacaaffd..c626b912d --date=short --no-merges --format='%ad %ae %s' 2020-07-29 dsinclair Update some language usage. (#1124) Created with: roll-dep third_party/shaderc Roll third_party/spirv-cross/ f5e9f4a17..82d1c43e4 (6 commits) https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross/+log/f5e9f4a1722e..82d1c43e4085 $ git log f5e9f4a17..82d1c43e4 --date=short --no-merges --format='%ad %ae %s' 2020-08-03 cdavis MSL: Fix handling of matrices and structs in the output control point array. 2020-07-29 post Add some test cases for complex type aliasing scenario. 2020-07-29 post Ensure that we use primary alias type when emitting flattened members. 2020-07-29 post GLSL: Be more aggressive about using type_alias. 2020-07-29 post Only rewrite type aliases for the base type. 2020-07-28 post GLSL: Add option to force flattening IO blocks. Created with: roll-dep third_party/spirv-cross Roll third_party/spirv-headers/ 979924c8b..3fdabd0da (4 commits) https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers/+log/979924c8bc83..3fdabd0da293 $ git log 979924c8b..3fdabd0da --date=short --no-merges --format='%ad %ae %s' 2020-08-03 44190824+mmerecki Reserve SPIR-V token range for upcoming Intel extensions. (#165) 2020-07-29 alanbaker Update BUILD.bazel and BUILD.gn (#166) 2020-07-29 alanbaker Publish the headers for the clspv embedded reflection non-semantic extended instruction set (#164) 2020-07-29 johnkslang Update the registry in spir-v.xml to modernize and split out opcodes. (#156) Created with: roll-dep third_party/spirv-headers Roll third_party/SPIRV-Tools/ 150be20d4..8bc27a1cf (17 commits) https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools/+log/150be20d4334..8bc27a1cfbc1 $ git log 150be20d4..8bc27a1cf --date=short --no-merges --format='%ad %ae %s' 2020-08-04 vasniktel spirv-fuzz: Remove OpFunctionCall operands in correct order (#3630) 2020-08-04 vasniktel spirv-fuzz: Handle capabilities during module donation (#3651) 2020-08-04 vasniktel spirv-fuzz: Refactor boilerplate in TransformationAddParameter (#3625) 2020-08-03 vasniktel spirv-fuzz: TransformationMoveInstructionDown (#3477) 2020-07-31 jaebaek Remove DebugDeclare only for target variables in ssa-rewrite (#3511) 2020-07-31 vasniktel Fix typo in ASAN CI build (#3623) 2020-07-30 stefanomil spirv-fuzz: Transformation to add loop preheader (#3599) 2020-07-30 stefanomil spirv-fuzz: Pass to replace int operands with ints of opposite signedness (#3612) 2020-07-30 jaebaek Debug info preservation in loop-unroll pass (#3548) 2020-07-30 alanbaker Validator support for non-semantic clspv reflection (#3618) 2020-07-30 vasniktel spirv-fuzz: Fix memory bugs (#3622) 2020-07-29 andreperezmaselco.developer spirv-fuzz: Implement the OpOuterProduct linear algebra case (#3617) 2020-07-30 vasniktel spirv-fuzz: Compute corollary facts from OpBitcast (#3538) 2020-07-29 dj2 Update some language usage. (#3611) 2020-07-29 vasniktel spirv-fuzz: Relax type constraints in DataSynonym facts (#3602) 2020-07-29 vasniktel spirv-fuzz: Remove non-deterministic behaviour (#3608) 2020-07-29 afdx Avoid use of 'sanity' and 'sanity check' in the code base (#3585) Created with: roll-dep third_party/SPIRV-Tools Roll third_party/tint/ c5cd8f5bd..f18d737b4 (26 commits) https://dawn.googlesource.com/tint/+log/c5cd8f5bd382..f18d737b4e93 $ git log c5cd8f5bd..f18d737b4 --date=short --no-merges --format='%ad %ae %s' 2020-08-04 rharrison Rolling 7 dependencies and fix BUILD.gn 2020-07-30 dsinclair [ast] Add texture types to the AST. 2020-07-30 dsinclair Add SamplerType to AST. 2020-07-30 dsinclair [hlsl-writer] Add loop support. 2020-07-30 dsinclair [hlsl-writer] Add if/else statements. 2020-07-30 dsinclair [hlsl-writer] Emit variable declarations. 2020-07-30 rharrison Add SPIR-V Reader Fuzzer 2020-07-30 rharrison Remove _exe suffix from sample program 2020-07-30 rharrison Change the default for BUILD.gn to build all the modules 2020-07-30 rharrison Simplify fuzzer targets to ease adding additional targets 2020-07-30 dsinclair Fixup build warnings 2020-07-30 dsinclair [wgsl-reader] Add stride support. 2020-07-30 dsinclair [wgsl-writer] Emit array stride decoration. 2020-07-30 idanr Add BlockStatement insert and non-const global_variables 2020-07-30 sarahmashay [Validator] Using pointers instead of refs 2020-07-29 dsinclair [hlsl-writer] Add member accessor emission. 2020-07-29 dsinclair [hlsl-writer] Add AsExpression to the HLSL backend. 2020-07-29 dsinclair [hlsl-writer] Add BlockStatement support. 2020-07-29 dsinclair [hlsl-writer] Emit discard. 2020-07-29 dsinclair [hlsl-writer] Emit array accessors. 2020-07-29 dsinclair [hlsl-writer] Add alias type support. 2020-07-29 dsinclair [hlsl-writer] Add constructor emission. 2020-07-29 dsinclair Add hlsl writer tests to BUILD.gn 2020-07-29 dsinclair [hlsl-writer] Add type emission. 2020-07-29 dsinclair Update some language usage. 2020-07-29 dneto [spirv-reader] Only support column-major matrices Created with: roll-dep third_party/tint Change-Id: I68064a00fb428d91aa00efa45f729bab1af2b103 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/26281 Reviewed-by: Ryan Harrison Reviewed-by: Austin Eng Commit-Queue: Ryan Harrison --- DEPS | 12 ++++++------ src/dawn_native/ShaderModule.cpp | 12 +++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index adb478d687..9e7cf6023b 100644 --- a/DEPS +++ b/DEPS @@ -66,31 +66,31 @@ deps = { # SPIRV-Cross 'third_party/spirv-cross': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@f5e9f4a1722ecd383aa5b1877c3ada544edd8b00', + 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@82d1c43e408510793a73a0886b5998283ee84d7b', 'condition': 'dawn_standalone', }, # SPIRV compiler dependencies: SPIRV-Tools, SPIRV-headers, glslang and shaderc 'third_party/SPIRV-Tools': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@150be20d4334b66c31a8ed81230f85b814b14a9f', + 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@8bc27a1cfbc19a9fb0cf244fab693ad8909659e5', 'condition': 'dawn_standalone', }, 'third_party/spirv-headers': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@979924c8bc839e4cb1b69d03d48398551f369ce7', + 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@3fdabd0da2932c276b25b9b4a988ba134eba1aa6', 'condition': 'dawn_standalone', }, 'third_party/glslang': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@3ee5f2f1d3316e228916788b300d786bb574d337', + 'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@2de6d657dde37a421ff8afb1bd820d522df5821d', 'condition': 'dawn_standalone', }, 'third_party/shaderc': { - 'url': '{chromium_git}/external/github.com/google/shaderc@cfacaaffd1fea5b413443a3b7c2f827c858de6bf', + 'url': '{chromium_git}/external/github.com/google/shaderc@c626b912dc4568867b29c5b221df6aac75390ab5', 'condition': 'dawn_standalone', }, # WGSL support 'third_party/tint': { - 'url': '{dawn_git}/tint@c5cd8f5bd3823c7e4b0d1d26d5de3465a9159eec', + 'url': '{dawn_git}/tint@f18d737b4e9318a1817126852edb6cc596ff1f5e', 'condition': 'dawn_standalone', }, diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp index 6ad0c457b1..402a47f395 100644 --- a/src/dawn_native/ShaderModule.cpp +++ b/src/dawn_native/ShaderModule.cpp @@ -356,11 +356,13 @@ namespace dawn_native { return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); } - tint::Validator validator; - if (!validator.Validate(module)) { - errorStream << "Validation: " << validator.error() << std::endl; - return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); - } + // TODO(rharrsion): Add this back in once multual dependencies are + // rolled into Chromium. + // tint::Validator validator; + // if (!validator.Validate(&module)) { + // errorStream << "Validation: " << validator.error() << std::endl; + // return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); + // } return {}; }