Skip to content

Commit da63ed2

Browse files
Firestar99Firestar99
committed
compiletest: remove ShaderClockKHR from implied target features, naga does not support it
1 parent 365b0e5 commit da63ed2

10 files changed

+3
-27
lines changed

‎tests/compiletests/src/main.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,7 @@ struct TestDeps {
346346
/// The RUSTFLAGS passed to all SPIR-V builds.
347347
// FIXME(eddyb) expose most of these from `spirv-builder`.
348348
fn rust_flags(codegen_backend_path: &Path) -> String {
349-
let target_features = [
350-
"Int8",
351-
"Int16",
352-
"Int64",
353-
"Float64",
354-
// Only needed for `ui/arch/read_clock_khr.rs`.
355-
"ShaderClockKHR",
356-
"ext:SPV_KHR_shader_clock",
357-
];
349+
let target_features = ["Int8", "Int16", "Int64", "Float64"];
358350

359351
[
360352
&*format!("-Zcodegen-backend={}", codegen_backend_path.display()),

‎tests/compiletests/ui/dis/asm_op_decorate.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
76
OpCapability RuntimeDescriptorArray
87
OpExtension "SPV_EXT_descriptor_indexing"
9-
OpExtension "SPV_KHR_shader_clock"
108
OpMemoryModel Logical Simple
119
OpEntryPoint Fragment %1 "main"
1210
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/dis/custom_entry_point.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
7-
OpExtension "SPV_KHR_shader_clock"
86
OpMemoryModel Logical Simple
97
OpEntryPoint Fragment %1 "hello_world"
108
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/dis/generic-fn-op-name.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
7-
OpExtension "SPV_KHR_shader_clock"
86
OpMemoryModel Logical Simple
97
OpEntryPoint Fragment %1 "main"
108
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/dis/issue-723-output.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
7-
OpExtension "SPV_KHR_shader_clock"
86
OpMemoryModel Logical Simple
97
OpEntryPoint Fragment %1 "main" %2
108
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/dis/non-writable-storage_buffer.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
7-
OpExtension "SPV_KHR_shader_clock"
86
OpMemoryModel Logical Simple
97
OpEntryPoint Fragment %1 "main"
108
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
76
OpExtension "SPV_KHR_non_semantic_info"
8-
OpExtension "SPV_KHR_shader_clock"
97
%1 = OpExtInstImport "NonSemantic.DebugPrintf"
108
OpMemoryModel Logical Simple
119
OpEntryPoint Fragment %2 "main"

‎tests/compiletests/ui/dis/panic_sequential_many.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
76
OpExtension "SPV_KHR_non_semantic_info"
8-
OpExtension "SPV_KHR_shader_clock"
97
%1 = OpExtInstImport "NonSemantic.DebugPrintf"
108
OpMemoryModel Logical Simple
119
OpEntryPoint Fragment %2 "main" %3 %4 %5

‎tests/compiletests/ui/dis/spec_constant-attr.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ OpCapability Float64
33
OpCapability Int64
44
OpCapability Int16
55
OpCapability Int8
6-
OpCapability ShaderClockKHR
7-
OpExtension "SPV_KHR_shader_clock"
86
OpMemoryModel Logical Simple
97
OpEntryPoint Fragment %1 "main" %2
108
OpExecutionMode %1 OriginUpperLeft

‎tests/compiletests/ui/image/query/sampled_image_rect_query_size_lod_err.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod` is not satisfied
2-
--> $DIR/sampled_image_rect_query_size_lod_err.rs:19:28
2+
--> $DIR/sampled_image_rect_query_size_lod_err.rs:21:28
33
|
4-
19 | *output = rect_sampled.query_size_lod(0);
4+
21 | *output = rect_sampled.query_size_lod(0);
55
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
77
= help: the following other types implement trait `HasQuerySizeLod`:

0 commit comments

Comments
 (0)