From 953e3d3cf6abc7418049818f4d5d49e652679118 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 11 Jun 2019 14:21:23 -0400 Subject: [PATCH 1/2] Roll all DEPS to HEAD It has been a while since this has been done, and there are some interdependent changes going on, which the autoroller cannot resolve. --- DEPS | 12 ++++++------ spvc/test/known_failures | 26 ++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 5df19361b..f2729d9eb 100644 --- a/DEPS +++ b/DEPS @@ -5,12 +5,12 @@ vars = { 'khronos_git': 'https://github.com/KhronosGroup', 'effcee_revision' : 'b83b58d177b797edd1f94c5f10837f2cc2863f0a', - 'glslang_revision': 'f88e5824d2cfca5edc58c7c2101ec9a4ec36afac', - 'googletest_revision': '0599a7b8410dc5cfdb477900b280475ae775d7f9', - 're2_revision': '90970542fe952602f42150c6e71d086f5afebcb3', - 'spirv_headers_revision': 'c4f8f65792d4bf2657ca751904c511bbcf2ac77b', - 'spirv_tools_revision': '0125b28ed4214d1860696f22d230dbfc965c6c2c', - 'spirv_cross_revision': 'fce83b7e8b0f6599efd4481992b2eb30f69f21de', + 'glslang_revision': '9866ad9195cec8f266f16191fb4ec2ce4896e5c0', + 'googletest_revision': '076b7f7788833ca31206bc30e5a2cfbdb9628f29', + 're2_revision': '0c95bcce2f1f0f071a786ca2c42384b211b8caba', + 'spirv_headers_revision': '9242862c84fe295ca0c9d26b36a6a891bb3ed6a7', + 'spirv_tools_revision': '9c0830133b07203a47ddc101fa4b298bab4438d8', + 'spirv_cross_revision': '5e9e8918f9a22d488811c575a97ccda2d8a8726d', } deps = { diff --git a/spvc/test/known_failures b/spvc/test/known_failures index 46ef3b001..b87645ff4 100644 --- a/spvc/test/known_failures +++ b/spvc/test/known_failures @@ -35,9 +35,31 @@ shaders-reflection/frag/spec-constant.vk.frag,False shaders-reflection/rgen/acceleration_structure.vk.rgen,False shaders-reflection/vert/read-from-row-major-array.vert,False shaders-reflection/vert/texture_buffer.vert,False -shaders/amd/shader_ballot_nonuniform_invocations.invalid.comp,False -shaders/amd/shader_ballot_nonuniform_invocations.invalid.comp,True shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag,False shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag,True shaders/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp.vk,False shaders/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp.vk,True +shaders-hlsl/asm/frag/line-directive.line.asm.frag,False +shaders-hlsl/asm/frag/line-directive.line.asm.frag,True +shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,False +shaders-msl/asm/frag/line-directive.line.asm.frag,False +shaders-msl/asm/frag/line-directive.line.asm.frag,True +shaders-msl/frag/nonuniform-qualifier.msl2.frag,False +shaders-msl/frag/nonuniform-qualifier.msl2.frag,True +shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,False +shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,True +shaders/asm/frag/line-directive.line.asm.frag,False +shaders/asm/frag/line-directive.line.asm.frag,True +shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk,False +shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk,True +shaders/vulkan/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag.vk,False +shaders/vulkan/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag.vk,True +shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,True +shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp,False +shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp,False +shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp,False +shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp,False +shaders-reflection/asm/op-source-none-ssbo-1.asm.comp,False +shaders-reflection/asm/op-source-none-ssbo-2.asm.comp,False +shaders-reflection/asm/op-source-none-uav-1.asm.comp,False +shaders-reflection/asm/op-source-none-uav-2.asm.comp,False From c26d2d1c649471551d0350e2d24bd6633953e993 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 11 Jun 2019 14:23:53 -0400 Subject: [PATCH 2/2] Actually sort the test lines --- spvc/test/known_failures | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/spvc/test/known_failures b/spvc/test/known_failures index b87645ff4..dd431c0eb 100644 --- a/spvc/test/known_failures +++ b/spvc/test/known_failures @@ -1,16 +1,24 @@ +shaders-hlsl/asm/frag/line-directive.line.asm.frag,False +shaders-hlsl/asm/frag/line-directive.line.asm.frag,True shaders-hlsl/comp/num-workgroups-alone.comp,False shaders-hlsl/comp/num-workgroups-alone.comp,True shaders-hlsl/comp/num-workgroups-with-builtins.comp,False shaders-hlsl/comp/num-workgroups-with-builtins.comp,True shaders-hlsl/frag/constant-buffer-array.invalid.sm51.frag,False shaders-hlsl/frag/constant-buffer-array.invalid.sm51.frag,True +shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,False +shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,True shaders-hlsl/frag/separate-combined-fake-overload.sm30.frag,False shaders-hlsl/frag/separate-combined-fake-overload.sm30.frag,True shaders-msl/asm/comp/multiple-entry.asm.comp,False shaders-msl/asm/comp/multiple-entry.asm.comp,True +shaders-msl/asm/frag/line-directive.line.asm.frag,False +shaders-msl/asm/frag/line-directive.line.asm.frag,True shaders-msl/asm/frag/min-max-clamp.invalid.asm.frag,False shaders-msl/frag/buffer-read-write.texture-buffer-native.msl21.frag,False shaders-msl/frag/buffer-read-write.texture-buffer-native.msl21.frag,True +shaders-msl/frag/nonuniform-qualifier.msl2.frag,False +shaders-msl/frag/nonuniform-qualifier.msl2.frag,True shaders-msl/frag/sampler-compare-cascade-gradient.ios.frag,False shaders-msl/frag/sampler-compare-cascade-gradient.ios.frag,True shaders-msl/frag/shadow-compare-global-alias.invalid.frag,False @@ -21,7 +29,17 @@ shaders-msl/vert/resource-arrays.ios.vert,False shaders-msl/vert/resource-arrays.ios.vert,True shaders-msl/vert/texture_buffer.texture-buffer-native.msl21.vert,False shaders-msl/vert/texture_buffer.texture-buffer-native.msl21.vert,True +shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,False +shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,True shaders-reflection/asm/aliased-entry-point-names.asm.multi,False +shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp,False +shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp,False +shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp,False +shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp,False +shaders-reflection/asm/op-source-none-ssbo-1.asm.comp,False +shaders-reflection/asm/op-source-none-ssbo-2.asm.comp,False +shaders-reflection/asm/op-source-none-uav-1.asm.comp,False +shaders-reflection/asm/op-source-none-uav-2.asm.comp,False shaders-reflection/comp/struct-layout.comp,False shaders-reflection/comp/struct-packing.comp,False shaders-reflection/frag/combined-texture-sampler-shadow.vk.frag,False @@ -35,31 +53,13 @@ shaders-reflection/frag/spec-constant.vk.frag,False shaders-reflection/rgen/acceleration_structure.vk.rgen,False shaders-reflection/vert/read-from-row-major-array.vert,False shaders-reflection/vert/texture_buffer.vert,False +shaders/asm/frag/line-directive.line.asm.frag,False +shaders/asm/frag/line-directive.line.asm.frag,True shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag,False shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag,True shaders/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp.vk,False shaders/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp.vk,True -shaders-hlsl/asm/frag/line-directive.line.asm.frag,False -shaders-hlsl/asm/frag/line-directive.line.asm.frag,True -shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,False -shaders-msl/asm/frag/line-directive.line.asm.frag,False -shaders-msl/asm/frag/line-directive.line.asm.frag,True -shaders-msl/frag/nonuniform-qualifier.msl2.frag,False -shaders-msl/frag/nonuniform-qualifier.msl2.frag,True -shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,False -shaders-msl/vulkan/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp,True -shaders/asm/frag/line-directive.line.asm.frag,False -shaders/asm/frag/line-directive.line.asm.frag,True shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk,False shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk,True shaders/vulkan/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag.vk,False shaders/vulkan/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag.vk,True -shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag,True -shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp,False -shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp,False -shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp,False -shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp,False -shaders-reflection/asm/op-source-none-ssbo-1.asm.comp,False -shaders-reflection/asm/op-source-none-ssbo-2.asm.comp,False -shaders-reflection/asm/op-source-none-uav-1.asm.comp,False -shaders-reflection/asm/op-source-none-uav-2.asm.comp,False