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

Normalize DEPS to ease merging with Dawn 

- Format specific targets to have the hash in the target rule instead
  of a variable.
- Only have the base part of the URL in a variable
- Use vulkan-deps instead of individual DEPS (spirv-tools,
  spirv-headers & glslang)

BUG=tint:1481

Change-Id: I871a656e26050698da2c77f4f39fec94a9c4f8a4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/84723
Reviewed-by: David Neto <dneto@google.com>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
Ryan Harrison 2022-03-28 18:01:02 +00:00 committed by Tint LUCI CQ
parent 9e5484264a
commit 3374f43c31
18 changed files with 146 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -19,13 +19,11 @@ lcov.info
/third_party/cpplint /third_party/cpplint
/third_party/benchmark /third_party/benchmark
/third_party/binutils /third_party/binutils
/third_party/glslang
/third_party/googletest /third_party/googletest
/third_party/gpuweb-cts /third_party/gpuweb-cts
/third_party/llvm-build /third_party/llvm-build
/third_party/protobuf /third_party/protobuf
/third_party/spirv-headers /third_party/vulkan-deps
/third_party/spirv-tools
/tools/clang /tools/clang
/tools/bin /tools/bin

4
CMakeLists.txt
View File

@ -200,7 +200,7 @@ if (${TINT_CHECK_CHROMIUM_STYLE})
endif() endif()
if (${TINT_BUILD_SPV_READER}) if (${TINT_BUILD_SPV_READER})
include_directories("${TINT_THIRD_PARTY_DIR}/spirv-tools/include") include_directories("${TINT_THIRD_PARTY_DIR}/vulkan-deps/spirv-tools/src/include")
endif() endif()
if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")) if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC"))
@ -264,7 +264,7 @@ function(tint_core_compile_options TARGET)
if (${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER}) if (${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
target_include_directories(${TARGET} PUBLIC target_include_directories(${TARGET} PUBLIC
"${TINT_THIRD_PARTY_DIR}/spirv-headers/include") "${TINT_THIRD_PARTY_DIR}/vulkan-deps/spirv-headers/src/include")
endif() endif()
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>) target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)

95
DEPS
View File

@ -7,24 +7,8 @@ gclient_gn_args = [
] ]
vars = { vars = {
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
'github': '/external/github.com',
'benchmark_revision': 'e991355c02b93fe17713efe04cbc2e278e00fdbd',
'build_revision': '555c8b467c21e2c4b22d00e87e3faa0431df9ac2',
'buildtools_revision': 'f78b4b9f33bd8ef9944d5ce643daff1c31880189',
'catapult_revision': 'fa35beefb3429605035f98211ddb8750dee6a13d',
'clang_format_revision': '2271e89c145a5e27d6c110b6a1113c057a8301a3',
'clang_revision': '8b7330592cb85ba09505a6be7bacabd0ad6160a3',
'glslang_revision': '4b7b86d568b40f4b076259dc2fc4cdd006340f34',
'googletest_revision': '6b74da4757a549563d7c37c8fae3e704662a043b',
'gpuweb_cts_revision': 'b0291fd966b55a5efc496772555b94842bde1085',
'libcxx_revision': '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'libcxxabi_revision': '2715a6c0de8dac4c7674934a6b3d30ba0c685271',
'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a',
'spirv_headers_revision': 'eddd4dfc930f1374a70797460240a501c7d333f7',
'spirv_tools_revision': 'df2aad68b98279412494a6d449bd71b6756e699b',
'testing_revision': 'd485ae97b7900c1fb7edfbe2901ae5adcb120865',
'tint_gn_revision': 'git_revision:281ba2c91861b10fec7407c4b6172ec3d4661243', 'tint_gn_revision': 'git_revision:281ba2c91861b10fec7407c4b6172ec3d4661243',
# We don't use location metadata in our test isolates. # We don't use location metadata in our test isolates.
@ -32,32 +16,29 @@ vars = {
} }
deps = { deps = {
'third_party/gpuweb-cts': Var('chromium_git') + Var('github') + 'third_party/gpuweb-cts': {
'/gpuweb/cts.git@' + Var('gpuweb_cts_revision'), 'url': '{chromium_git}/external/github.com/gpuweb/cts@b0291fd966b55a5efc496772555b94842bde1085',
},
'third_party/spirv-headers': Var('chromium_git') + Var('github') + 'third_party/vulkan-deps': {
'/KhronosGroup/SPIRV-Headers.git@' + Var('spirv_headers_revision'), 'url': '{chromium_git}/vulkan-deps@20efc30b0c6fe3c9bbd4f8ed6335593ee51391b0',
},
'third_party/spirv-tools': Var('chromium_git') + Var('github') +
'/KhronosGroup//SPIRV-Tools.git@' + Var('spirv_tools_revision'),
'third_party/glslang': Var('chromium_git') + Var('github') +
'/KhronosGroup/glslang.git@' + Var('glslang_revision'),
# Dependencies required to use GN/Clang in standalone # Dependencies required to use GN/Clang in standalone
'build': Var('chromium_git') + '/chromium/src/build@' + 'build': {
Var('build_revision'), 'url': '{chromium_git}/chromium/src/build@555c8b467c21e2c4b22d00e87e3faa0431df9ac2',
},
'buildtools': Var('chromium_git') + '/chromium/src/buildtools@' + 'buildtools': {
Var('buildtools_revision'), 'url': '{chromium_git}/chromium/src/buildtools@f78b4b9f33bd8ef9944d5ce643daff1c31880189',
},
'tools/clang': Var('chromium_git') + '/chromium/src/tools/clang@' + 'tools/clang': {
Var('clang_revision'), 'url': '{chromium_git}/chromium/src/tools/clang@8b7330592cb85ba09505a6be7bacabd0ad6160a3',
},
'buildtools/clang_format/script': { 'buildtools/clang_format/script': {
'url': Var('chromium_git') + 'url': '{chromium_git}/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@2271e89c145a5e27d6c110b6a1113c057a8301a3',
'/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
Var('clang_format_revision'),
}, },
'buildtools/linux64': { 'buildtools/linux64': {
@ -85,31 +66,34 @@ deps = {
'condition': 'host_os == "win"', 'condition': 'host_os == "win"',
}, },
'buildtools/third_party/libc++/trunk': 'buildtools/third_party/libc++/trunk': {
Var('chromium_git') + 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'/external/github.com/llvm/llvm-project/libcxx.git@' + },
Var('libcxx_revision'),
'buildtools/third_party/libc++abi/trunk': 'buildtools/third_party/libc++abi/trunk': {
Var('chromium_git') + 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@2715a6c0de8dac4c7674934a6b3d30ba0c685271',
'/external/github.com/llvm/llvm-project/libcxxabi.git@' + },
Var('libcxxabi_revision'),
# Dependencies required for testing # Dependencies required for testing
'testing': Var('chromium_git') + '/chromium/src/testing@' + 'testing': {
Var('testing_revision'), 'url': '{chromium_git}/chromium/src/testing@d485ae97b7900c1fb7edfbe2901ae5adcb120865',
},
'third_party/catapult': Var('chromium_git') + '/catapult.git@' + 'third_party/catapult': {
Var('catapult_revision'), 'url': '{chromium_git}/catapult.git@fa35beefb3429605035f98211ddb8750dee6a13d',
},
'third_party/benchmark': Var('chromium_git') + Var('github') + 'third_party/benchmark': {
'/google/benchmark.git@' + Var('benchmark_revision'), 'url': '{chromium_git}/external/github.com/google/benchmark.git@e991355c02b93fe17713efe04cbc2e278e00fdbd',
},
'third_party/googletest': Var('chromium_git') + Var('github') + 'third_party/googletest': {
'/google/googletest.git@' + Var('googletest_revision'), 'url': '{chromium_git}/external/github.com/google/googletest.git@6b74da4757a549563d7c37c8fae3e704662a043b',
},
'third_party/protobuf': Var('chromium_git') + Var('github') + 'third_party/protobuf': {
'/protocolbuffers/protobuf.git@' + Var('protobuf_revision'), 'url': '{chromium_git}/external/github.com/protocolbuffers/protobuf.git@fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a',
},
} }
hooks = [ hooks = [
@ -210,4 +194,7 @@ hooks = [
recursedeps = [ recursedeps = [
# buildtools provides clang_format, libc++, and libc++abi # buildtools provides clang_format, libc++, and libc++abi
'buildtools', 'buildtools',
# vulkan-deps provides spirv-headers, spirv-tools & gslang
# It also provides other Vulkan tools that Tint doesn't use
'third_party/vulkan-deps',
] ]

2
build_overrides/glslang.gni
View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
glslang_spirv_tools_dir = "//third_party/spirv-tools" glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"

2
build_overrides/spirv_tools.gni
View File

@ -17,4 +17,4 @@ spirv_tools_standalone = false
# Paths to SPIRV-Tools dependencies in Tint # Paths to SPIRV-Tools dependencies in Tint
spirv_tools_googletest_dir = "//third_party/googletest" spirv_tools_googletest_dir = "//third_party/googletest"
spirv_tools_spirv_headers_dir = "//third_party/spirv-headers" spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"

4
src/tint/cmd/BUILD.gn
View File

@ -27,8 +27,8 @@ executable("tint") {
if (tint_build_glsl_writer) { if (tint_build_glsl_writer) {
deps += [ deps += [
"${tint_root_dir}/third_party/glslang:glslang_default_resource_limits_sources", "${tint_root_dir}/third_party/vulkan-deps/glslang/src:glslang_default_resource_limits_sources",
"${tint_root_dir}/third_party/glslang:glslang_lib_sources", "${tint_root_dir}/third_party/vulkan-deps/glslang/src:glslang_lib_sources",
] ]
} }

25
test/tint/benchmark/particles.wgsl.expected.glsl
View File

@ -170,7 +170,7 @@ struct UBO {
uint width; uint width;
}; };
uniform highp sampler2D tint_symbol_1; uniform highp sampler2D tint_symbol_6;
void simulate(uvec3 GlobalInvocationID) { void simulate(uvec3 GlobalInvocationID) {
rand_seed = ((sim_params.seed.xy + vec2(GlobalInvocationID.xy)) * sim_params.seed.zw); rand_seed = ((sim_params.seed.xy + vec2(GlobalInvocationID.xy)) * sim_params.seed.zw);
uint idx = GlobalInvocationID.x; uint idx = GlobalInvocationID.x;
@ -182,22 +182,27 @@ void simulate(uvec3 GlobalInvocationID) {
if ((particle.lifetime < 0.0f)) { if ((particle.lifetime < 0.0f)) {
ivec2 coord = ivec2(0, 0); ivec2 coord = ivec2(0, 0);
{ {
for(int level = (textureQueryLevels(tint_symbol_1) - 1); (level > 0); level = (level - 1)) { for(int level = (textureQueryLevels(tint_symbol_6) - 1); (level > 0); level = (level - 1)) {
vec4 probabilites = texelFetch(tint_symbol_1, coord, level); vec4 probabilites = texelFetch(tint_symbol_6, coord, level);
vec4 value = vec4(rand()); float tint_symbol_5 = rand();
vec4 value = vec4(tint_symbol_5);
bvec4 mask = bvec4(uvec4(greaterThanEqual(value, vec4(0.0f, probabilites.xyz))) & uvec4(lessThan(value, probabilites))); bvec4 mask = bvec4(uvec4(greaterThanEqual(value, vec4(0.0f, probabilites.xyz))) & uvec4(lessThan(value, probabilites)));
coord = (coord * 2); coord = (coord * 2);
coord.x = (coord.x + (any(mask.yw) ? 1 : 0)); coord.x = (coord.x + (any(mask.yw) ? 1 : 0));
coord.y = (coord.y + (any(mask.zw) ? 1 : 0)); coord.y = (coord.y + (any(mask.zw) ? 1 : 0));
} }
} }
vec2 uv = (vec2(coord) / vec2(textureSize(tint_symbol_1, 0))); vec2 uv = (vec2(coord) / vec2(textureSize(tint_symbol_6, 0)));
particle.position = vec3((((uv - 0.5f) * 3.0f) * vec2(1.0f, -1.0f)), 0.0f); particle.position = vec3((((uv - 0.5f) * 3.0f) * vec2(1.0f, -1.0f)), 0.0f);
particle.color = texelFetch(tint_symbol_1, coord, 0); particle.color = texelFetch(tint_symbol_6, coord, 0);
particle.velocity.x = ((rand() - 0.5f) * 0.100000001f); float tint_symbol_1 = rand();
particle.velocity.y = ((rand() - 0.5f) * 0.100000001f); particle.velocity.x = ((tint_symbol_1 - 0.5f) * 0.100000001f);
particle.velocity.z = (rand() * 0.300000012f); float tint_symbol_2 = rand();
particle.lifetime = (0.5f + (rand() * 2.0f)); particle.velocity.y = ((tint_symbol_2 - 0.5f) * 0.100000001f);
float tint_symbol_3 = rand();
particle.velocity.z = (tint_symbol_3 * 0.300000012f);
float tint_symbol_4 = rand();
particle.lifetime = (0.5f + (tint_symbol_4 * 2.0f));
} }
data.particles[idx] = particle; data.particles[idx] = particle;
} }

16
test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl
View File

@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es #version 310 es
precision mediump float; precision mediump float;
@ -28,6 +30,13 @@ void main() {
fragment_main(); fragment_main();
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:6: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:6: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.
#version 310 es #version 310 es
ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) { ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) {
@ -58,3 +67,10 @@ void main() {
compute_main(); compute_main();
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:5: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:5: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.

16
test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl
View File

@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es #version 310 es
precision mediump float; precision mediump float;
@ -28,6 +30,13 @@ void main() {
fragment_main(); fragment_main();
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:6: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:6: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.
#version 310 es #version 310 es
uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) { uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) {
@ -58,3 +67,10 @@ void main() {
compute_main(); compute_main();
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:5: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:5: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.

9
test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl
View File

@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es #version 310 es
ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) { ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) {
@ -26,3 +28,10 @@ void main() {
compute_main(gl_LocalInvocationIndex); compute_main(gl_LocalInvocationIndex);
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:5: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:5: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.

9
test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl
View File

@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es #version 310 es
uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) { uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) {
@ -26,3 +28,10 @@ void main() {
compute_main(gl_LocalInvocationIndex); compute_main(gl_LocalInvocationIndex);
return; return;
} }
Error parsing GLSL shader:
ERROR: 0:5: 'atomicCompSwap' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 0:5: '' : compilation terminated
ERROR: 2 compilation errors. No code generated.

2
test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl
View File

@ -1,6 +1,6 @@
SKIP: FAILED SKIP: FAILED
../../src/tint/writer/glsl/generator_impl.cc:2587 internal compiler error: Multiplanar external texture transform was not run. ../../src/tint/writer/glsl/generator_impl.cc:2544 internal compiler error: Multiplanar external texture transform was not run.
******************************************************************** ********************************************************************

2
test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl
View File

@ -1,6 +1,6 @@
SKIP: FAILED SKIP: FAILED
../../src/tint/writer/glsl/generator_impl.cc:2587 internal compiler error: Multiplanar external texture transform was not run. ../../src/tint/writer/glsl/generator_impl.cc:2544 internal compiler error: Multiplanar external texture transform was not run.
******************************************************************** ********************************************************************

2
test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl
View File

@ -1,6 +1,6 @@
SKIP: FAILED SKIP: FAILED
../../src/tint/writer/glsl/generator_impl.cc:2587 internal compiler error: Multiplanar external texture transform was not run. ../../src/tint/writer/glsl/generator_impl.cc:2544 internal compiler error: Multiplanar external texture transform was not run.
******************************************************************** ********************************************************************

39
test/tint/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl
View File

@ -1,45 +1,37 @@
SKIP: FAILED SKIP: FAILED
vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
type Arr = @stride(16) array<f32, 3>;
^^^^^^
vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
type Arr_1 = @stride(16) array<i32, 4>;
^^^^^^
#version 310 es #version 310 es
precision mediump float; precision mediump float;
layout(location = 0) out vec4 x_GLF_color_1_1; layout(location = 0) out vec4 x_GLF_color_1_1;
struct tint_padded_array_element { struct strided_arr {
float el; float el;
}; };
struct buf1 { struct buf1 {
tint_padded_array_element x_GLF_uniform_float_values[3]; strided_arr x_GLF_uniform_float_values[3];
}; };
struct tint_padded_array_element_1 { struct strided_arr_1 {
int el; int el;
}; };
struct buf0 { struct buf0 {
tint_padded_array_element_1 x_GLF_uniform_int_values[4]; strided_arr_1 x_GLF_uniform_int_values[4];
}; };
layout(binding = 1) uniform buf1_1 { layout(binding = 1) uniform buf1_1 {
tint_padded_array_element x_GLF_uniform_float_values[3]; strided_arr x_GLF_uniform_float_values[3];
} x_6; } x_6;
layout(binding = 0) uniform buf0_1 { layout(binding = 0) uniform buf0_1 {
tint_padded_array_element_1 x_GLF_uniform_int_values[4]; strided_arr_1 x_GLF_uniform_int_values[4];
} x_8; } x_8;
vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
void main_1() { void main_1() {
mat4x3 m43 = mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); mat4x3 m43 = mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
tint_padded_array_element sums[3] = tint_padded_array_element[3](tint_padded_array_element(0.0f), tint_padded_array_element(0.0f), tint_padded_array_element(0.0f)); strided_arr sums[3] = strided_arr[3](strided_arr(0.0f), strided_arr(0.0f), strided_arr(0.0f));
int i = 0; int i = 0;
int a = 0; int a = 0;
int x_67_phi = 0; int x_67_phi = 0;
@ -53,8 +45,11 @@ void main_1() {
float x_58 = x_6.x_GLF_uniform_float_values[0].el; float x_58 = x_6.x_GLF_uniform_float_values[0].el;
float x_60 = x_6.x_GLF_uniform_float_values[0].el; float x_60 = x_6.x_GLF_uniform_float_values[0].el;
float x_62 = x_6.x_GLF_uniform_float_values[0].el; float x_62 = x_6.x_GLF_uniform_float_values[0].el;
tint_padded_array_element tint_symbol_1[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); strided_arr tint_symbol_1 = strided_arr(x_58);
sums = tint_symbol_1; strided_arr tint_symbol_2 = strided_arr(x_60);
strided_arr tint_symbol_3 = strided_arr(x_62);
strided_arr tint_symbol_4[3] = strided_arr[3](tint_symbol_1, tint_symbol_2, tint_symbol_3);
sums = tint_symbol_4;
int x_65 = x_8.x_GLF_uniform_int_values[0].el; int x_65 = x_8.x_GLF_uniform_int_values[0].el;
i = x_65; i = x_65;
x_67_phi = x_65; x_67_phi = x_65;
@ -110,8 +105,8 @@ struct main_out {
main_out tint_symbol() { main_out tint_symbol() {
main_1(); main_1();
main_out tint_symbol_2 = main_out(x_GLF_color); main_out tint_symbol_5 = main_out(x_GLF_color);
return tint_symbol_2; return tint_symbol_5;
} }
void main() { void main() {
@ -120,9 +115,9 @@ void main() {
return; return;
} }
Error parsing GLSL shader: Error parsing GLSL shader:
ERROR: 0:74: '[' : matrix index out of range '4' ERROR: 0:77: '[' : matrix index out of range '4'
ERROR: 0:74: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' ERROR: 0:77: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float'
ERROR: 0:74: '' : compilation terminated ERROR: 0:77: '' : compilation terminated
ERROR: 3 compilation errors. No code generated. ERROR: 3 compilation errors. No code generated.

20
test/tint/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl
View File

@ -1,39 +1,31 @@
SKIP: FAILED SKIP: FAILED
vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
type Arr = @stride(16) array<f32, 2>;
^^^^^^
vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
type Arr_1 = @stride(16) array<i32, 3>;
^^^^^^
#version 310 es #version 310 es
precision mediump float; precision mediump float;
layout(location = 0) out vec4 x_GLF_color_1_1; layout(location = 0) out vec4 x_GLF_color_1_1;
struct tint_padded_array_element { struct strided_arr {
float el; float el;
}; };
struct buf1 { struct buf1 {
tint_padded_array_element x_GLF_uniform_float_values[2]; strided_arr x_GLF_uniform_float_values[2];
}; };
struct tint_padded_array_element_1 { struct strided_arr_1 {
int el; int el;
}; };
struct buf0 { struct buf0 {
tint_padded_array_element_1 x_GLF_uniform_int_values[3]; strided_arr_1 x_GLF_uniform_int_values[3];
}; };
layout(binding = 1) uniform buf1_1 { layout(binding = 1) uniform buf1_1 {
tint_padded_array_element x_GLF_uniform_float_values[2]; strided_arr x_GLF_uniform_float_values[2];
} x_6; } x_6;
layout(binding = 0) uniform buf0_1 { layout(binding = 0) uniform buf0_1 {
tint_padded_array_element_1 x_GLF_uniform_int_values[3]; strided_arr_1 x_GLF_uniform_int_values[3];
} x_8; } x_8;
vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);

10
third_party/CMakeLists.txt vendored
View File

@ -31,7 +31,7 @@ endif()
if(${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER}) if(${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
if (NOT IS_DIRECTORY "${SPIRV-Headers_SOURCE_DIR}") if (NOT IS_DIRECTORY "${SPIRV-Headers_SOURCE_DIR}")
set(SPIRV-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers CACHE STRING "Source directory for SPIR-V headers") set(SPIRV-Headers_SOURCE_DIR "${TINT_THIRD_PARTY_DIR}/vulkan-deps/spirv-headers/src" CACHE STRING "Source directory for SPIR-V headers")
endif() endif()
if (NOT TARGET SPIRV-Tools) if (NOT TARGET SPIRV-Tools)
@ -40,14 +40,14 @@ if(${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
if (${TINT_BUILD_SPIRV_TOOLS_FUZZER}) if (${TINT_BUILD_SPIRV_TOOLS_FUZZER})
set(SPIRV_BUILD_FUZZER ON CACHE BOOL "Controls whether spirv-fuzz is built" FORCE) set(SPIRV_BUILD_FUZZER ON CACHE BOOL "Controls whether spirv-fuzz is built" FORCE)
endif() endif()
set(SPIRV-Headers_SOURCE_DIR "${TINT_THIRD_PARTY_DIR}/spirv-headers") set(SPIRV-Headers_SOURCE_DIR "${TINT_THIRD_PARTY_DIR}/vulkan-deps/spirv-headers/src")
add_subdirectory("${TINT_THIRD_PARTY_DIR}/spirv-tools" "${CMAKE_BINARY_DIR}/third_party/spirv-tools" EXCLUDE_FROM_ALL) add_subdirectory("${TINT_THIRD_PARTY_DIR}/vulkan-deps/spirv-tools/src" "${CMAKE_BINARY_DIR}/third_party/spirv-tools" EXCLUDE_FROM_ALL)
endif() endif()
endif() endif()
if(${TINT_BUILD_GLSL_WRITER}) if(${TINT_BUILD_GLSL_WRITER})
set(SPIRV-Headers_SOURCE_DIR "${TINT_THIRD_PARTY_DIR}/glslang") set(SPIRV-Headers_SOURCE_DIR "${TINT_THIRD_PARTY_DIR}/vulkan-deps/glslang/src")
if(${TINT_BUILD_SAMPLES}) if(${TINT_BUILD_SAMPLES})
add_subdirectory("${TINT_THIRD_PARTY_DIR}/glslang" "${CMAKE_BINARY_DIR}/third_party/glslang" EXCLUDE_FROM_ALL) add_subdirectory("${TINT_THIRD_PARTY_DIR}/vulkan-deps/glslang/src" "${CMAKE_BINARY_DIR}/third_party/glslang" EXCLUDE_FROM_ALL)
endif() endif()
endif() endif()

4
tint_overrides_with_defaults.gni
View File

@ -24,7 +24,7 @@ declare_args() {
# Path to spirv-tools checkout # Path to spirv-tools checkout
if (!defined(tint_spirv_tools_dir)) { if (!defined(tint_spirv_tools_dir)) {
tint_spirv_tools_dir = "//third_party/spirv-tools" tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
} }
# Path to googletest checkout # Path to googletest checkout
@ -34,7 +34,7 @@ declare_args() {
# Path to spirv-headers checkout # Path to spirv-headers checkout
if (!defined(tint_spirv_headers_dir)) { if (!defined(tint_spirv_headers_dir)) {
tint_spirv_headers_dir = "//third_party/spirv-headers" tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
} }
# Build the SPIR-V input reader # Build the SPIR-V input reader