AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)"

Browse Source 
This reverts commit 14fdcdc891.

Reason for revert: speculative revert to see if this is cause the d3d failures.

Original change's description:
> Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)
> 
> Also includes a build file fix for glslang.
> 
> https://dawn.googlesource.com/dawn.git/+log/0d52f800a1d1..b31f5e717e2d
> 
> 2020-07-14 enga@chromium.org Remove kMaxBindingsPerGroup limit
> 2020-07-14 rharrison@chromium.org Roll 5 dependencies
> 2020-07-14 kainino@chromium.org Skip clang-format on Windows
> 2020-07-14 cwallez@chromium.org Rolling build dependencies.
> 
> Also rolling transitive DEPS:
>   https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang from 29c9135d06f1 to b481744aea1e
>   https://chromium.googlesource.com/external/github.com/google/shaderc from 1402ed576596 to 5515d2a0c20c
> 
> Change-Id: I8af4c9a0bcd031fde120c9b2108b3bd2c1db0174
> Bug: None
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302796
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>

TBR=borenet@google.com,bsalomon@google.com,cwallez@chromium.org

Change-Id: Ieae7fe809da0a9b9404da26163c96015f97e9761
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302898
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2020-07-15 14:23:50 +00:00 committed by Skia Commit-Bot
parent a58db7f87e
commit 06980dba90
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -10,11 +10,11 @@ deps = {
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@4ad0f250a01010651985f2a1772c5cff11257d7a",
# Dawn requires jinja2 and markupsafe for the code generator, and glslang and shaderc for SPIRV compilation.
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@b31f5e717e2d5de567ee7a5b6a32acdf16ba180c",
"third_party/externals/glslang" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang@b481744aea1ecf52ee4591afaa0f5e270b9d1636",
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@0d52f800a1d15c2941c3d177f7a5313bdba0bd79",
"third_party/externals/glslang" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang@29c9135d06f12628e3161e4aa751610c5941d8d6",
"third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@b41863e42637544c2941b574c7877d3e1f663e25",
"third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
"third_party/externals/shaderc" : "https://chromium.googlesource.com/external/github.com/google/shaderc@5515d2a0c20cb73e68190b9a39445d4bea4eeeab",
"third_party/externals/shaderc" : "https://chromium.googlesource.com/external/github.com/google/shaderc@1402ed576596f53eaf3f8d390a9e1defbeffd014",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@e976867fb57a0cd87e3b0fe05d59e0ed63c6febb",

29
third_party/glslang/BUILD.gn vendored
View File

@ -10,28 +10,6 @@ glslang_root = "../externals/glslang"
spirv_tools_dir = glslang_spirv_tools_dir
action("glslang_build_info") {
script = "${glslang_root}/build_info.py"
changes_file = "${glslang_root}/CHANGES.md"
template_file = "${glslang_root}/build_info.h.tmpl"
out_file = "${target_gen_dir}/include/glslang/build_info.h"
inputs = [
changes_file,
script,
template_file,
]
outputs = [ out_file ]
args = [
rebase_path(glslang_root, root_build_dir),
"-i",
rebase_path(template_file, root_build_dir),
"-o",
rebase_path(out_file, root_build_dir),
]
}
third_party("glslang_sources") {
public_include_dirs = [ "$glslang_root" ]
public_defines = [ "ENABLE_HLSL=1" ]
@ -94,6 +72,7 @@ third_party("glslang_sources") {
"glslang/Include/Types.h",
"glslang/Include/arrays.h",
"glslang/Include/intermediate.h",
"glslang/Include/revision.h",
"glslang/MachineIndependent/Constant.cpp",
"glslang/MachineIndependent/InfoSink.cpp",
"glslang/MachineIndependent/Initialize.cpp",
@ -155,9 +134,5 @@ third_party("glslang_sources") {
defines += [ "GLSLANG_OSINCLUDE_UNIX" ]
}
include_dirs = [ "${target_gen_dir}/include" ]
deps = [
":glslang_build_info",
"${spirv_tools_dir}:spvtools_val",
]
deps = [ "${spirv_tools_dir}:spvtools_val" ]
}