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

View File

@@ -170,7 +170,7 @@ struct UBO {
uint width;
};
uniform highp sampler2D tint_symbol_1;
uniform highp sampler2D tint_symbol_6;
void simulate(uvec3 GlobalInvocationID) {
rand_seed = ((sim_params.seed.xy + vec2(GlobalInvocationID.xy)) * sim_params.seed.zw);
uint idx = GlobalInvocationID.x;
@@ -182,22 +182,27 @@ void simulate(uvec3 GlobalInvocationID) {
if ((particle.lifetime < 0.0f)) {
ivec2 coord = ivec2(0, 0);
{
for(int level = (textureQueryLevels(tint_symbol_1) - 1); (level > 0); level = (level - 1)) {
vec4 probabilites = texelFetch(tint_symbol_1, coord, level);
vec4 value = vec4(rand());
for(int level = (textureQueryLevels(tint_symbol_6) - 1); (level > 0); level = (level - 1)) {
vec4 probabilites = texelFetch(tint_symbol_6, coord, level);
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)));
coord = (coord * 2);
coord.x = (coord.x + (any(mask.yw) ? 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.color = texelFetch(tint_symbol_1, coord, 0);
particle.velocity.x = ((rand() - 0.5f) * 0.100000001f);
particle.velocity.y = ((rand() - 0.5f) * 0.100000001f);
particle.velocity.z = (rand() * 0.300000012f);
particle.lifetime = (0.5f + (rand() * 2.0f));
particle.color = texelFetch(tint_symbol_6, coord, 0);
float tint_symbol_1 = rand();
particle.velocity.x = ((tint_symbol_1 - 0.5f) * 0.100000001f);
float tint_symbol_2 = rand();
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;
}

View File

@@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es
precision mediump float;
@@ -28,6 +30,13 @@ void main() {
fragment_main();
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
ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) {
@@ -58,3 +67,10 @@ void main() {
compute_main();
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.

View File

@@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es
precision mediump float;
@@ -28,6 +30,13 @@ void main() {
fragment_main();
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
uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) {
@@ -58,3 +67,10 @@ void main() {
compute_main();
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.

View File

@@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es
ivec2 tint_atomicCompareExchangeWeak(inout int param_0, int param_1, int param_2) {
@@ -26,3 +28,10 @@ void main() {
compute_main(gl_LocalInvocationIndex);
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.

View File

@@ -1,3 +1,5 @@
SKIP: FAILED
#version 310 es
uvec2 tint_atomicCompareExchangeWeak(inout uint param_0, uint param_1, uint param_2) {
@@ -26,3 +28,10 @@ void main() {
compute_main(gl_LocalInvocationIndex);
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.

View File

@@ -1,6 +1,6 @@
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.
********************************************************************

View File

@@ -1,6 +1,6 @@
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.
********************************************************************

View File

@@ -1,6 +1,6 @@
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.
********************************************************************

View File

@@ -1,45 +1,37 @@
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
precision mediump float;
layout(location = 0) out vec4 x_GLF_color_1_1;
struct tint_padded_array_element {
struct strided_arr {
float el;
};
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;
};
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 {
tint_padded_array_element x_GLF_uniform_float_values[3];
strided_arr x_GLF_uniform_float_values[3];
} x_6;
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;
vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
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);
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 a = 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_60 = 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));
sums = tint_symbol_1;
strided_arr tint_symbol_1 = strided_arr(x_58);
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;
i = x_65;
x_67_phi = x_65;
@@ -110,8 +105,8 @@ struct main_out {
main_out tint_symbol() {
main_1();
main_out tint_symbol_2 = main_out(x_GLF_color);
return tint_symbol_2;
main_out tint_symbol_5 = main_out(x_GLF_color);
return tint_symbol_5;
}
void main() {
@@ -120,9 +115,9 @@ void main() {
return;
}
Error parsing GLSL shader:
ERROR: 0:74: '[' : 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:74: '' : compilation terminated
ERROR: 0:77: '[' : matrix index out of range '4'
ERROR: 0:77: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float'
ERROR: 0:77: '' : compilation terminated
ERROR: 3 compilation errors. No code generated.

View File

@@ -1,39 +1,31 @@
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
precision mediump float;
layout(location = 0) out vec4 x_GLF_color_1_1;
struct tint_padded_array_element {
struct strided_arr {
float el;
};
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;
};
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 {
tint_padded_array_element x_GLF_uniform_float_values[2];
strided_arr x_GLF_uniform_float_values[2];
} x_6;
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;
vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);