summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2023-08-24 16:32:33 -0700
committerGitHub <noreply@github.com>2023-08-24 16:32:33 -0700
commit0470ea05a42d6c3f35d81a433fefdd440500cdbd (patch)
tree25feb7bfd539013bfa64d8ff7698262932e39110 /tests
parentc515bf9edf0ceefa9a0c9b36626ea7c8f72ce36f (diff)
Misc. SPIRV Fixes, Part 2. (#3147)
* Misc. SPIRV Fixes, Part 2. * Fix up. * Fix. * Add system smenatic values. * 16 bit int and floats, matrix/vector reshape, bool ops. * Fix. * Fix. * Allow push constant entry point params. * entrypoint params. * swizzleSet and swizzledStore. * packoffset. * string hash. * Fix. * Matrix arithmetics. --------- Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected-failure.txt42
-rw-r--r--tests/vkray/raygen.slang.glsl52
2 files changed, 26 insertions, 68 deletions
diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt
index aa00e810b..d5934a3c5 100644
--- a/tests/expected-failure.txt
+++ b/tests/expected-failure.txt
@@ -1,62 +1,29 @@
tests/autodiff/global-param-hoisting.slang.1 (vk)
-tests/autodiff/high-order-builtins-2.slang.2 (vk)
-tests/autodiff/matrix-arithmetic-fwd.slang.1 (vk)
-tests/autodiff/reverse-switch-case.slang.1 (vk)
-tests/autodiff/bsdf/bsdf-sample.slang (vk)
tests/bugs/atomic-coerce.slang.1 (vk)
tests/bugs/bool-op.slang.1 (vk)
tests/bugs/buffer-swizzle-store.slang.1 (vk)
tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk)
tests/bugs/gh-3075.slang.2 (vk)
-tests/bugs/glsl-static-const-array.slang (vk)
-tests/bugs/matrix-reshape.slang.1 (vk)
-tests/bugs/nested-switch.slang.1 (vk)
-tests/bugs/parameter-block-load.slang (vk)
-tests/bugs/parens-cast-issue.slang.1 (vk)
tests/bugs/ray-query-in-generic.slang.1 (vk)
-tests/bugs/string-inline.slang.4 (vk)
tests/bugs/vec-compare.slang.2 (vk)
-tests/bugs/vec-init.slang.2 (vk)
-tests/bugs/inlining/global-const-inline.slang.1 (vk)
-tests/compute/buffer-layout.slang.2 (vk)
-tests/compute/dynamic-dispatch-16.slang (vk)
-tests/compute/dynamic-dispatch-17.slang (vk)
-tests/compute/dynamic-dispatch-18.slang.2 (vk)
-tests/compute/entry-point-uniform-params.slang.2 (vk)
-tests/compute/frem.slang.2 (vk)
-tests/compute/func-cbuffer-param.slang.2 (vk)
tests/compute/half-rw-texture-convert.slang.4 (vk)
tests/compute/half-rw-texture-convert2.slang.4 (vk)
tests/compute/half-vector-compare.slang.1 (vk)
-tests/compute/interface-shader-param-in-struct.slang.2 (vk)
tests/compute/loop-unroll.slang.5 (vk)
-tests/compute/pack-any-value-16bit.slang (vk)
-tests/compute/parameter-block.slang.2 (vk)
tests/compute/ray-tracing-inline.slang.1 (vk)
tests/compute/rw-texture-simple.slang.4 (vk)
-tests/compute/semantic.slang.3 (vk)
-tests/compute/static-const-array.slang.1 (vk)
tests/compute/static-const-matrix-array.slang.1 (vk)
-tests/compute/static-const-vector-array.slang.1 (vk)
tests/compute/texture-sample-grad-offset-clamp.slang (vk)
tests/compute/texture-simple.slang.4 (vk)
tests/compute/texture-simpler.slang (vk)
-tests/compute/vector-scalar-compare.slang.1 (vk)
-tests/cross-compile/glsl-bool-ops.slang.1 (vk)
tests/hlsl/glsl-matrix-layout.slang (vk)
-tests/hlsl/packoffset.slang.1 (vk)
-tests/hlsl-intrinsic/asfloat16.slang.3 (vk)
tests/hlsl-intrinsic/bit-cast-double.slang.3 (vk)
tests/hlsl-intrinsic/classify-double.slang.3 (vk)
tests/hlsl-intrinsic/classify-float.slang.3 (vk)
-tests/hlsl-intrinsic/f16tof32.slang.3 (vk)
-tests/hlsl-intrinsic/f32tof16.slang.3 (vk)
-tests/hlsl-intrinsic/literal-int64.slang.4 (vk)
tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang.4 (vk)
tests/hlsl-intrinsic/scalar-double-simple.slang.4 (vk)
tests/hlsl-intrinsic/scalar-double-vk-intrinsic.slang.1 (vk)
tests/hlsl-intrinsic/scalar-float.slang.3 (vk)
-tests/hlsl-intrinsic/scalar-int64.slang.4 (vk)
tests/hlsl-intrinsic/scalar-uint.slang.3 (vk)
tests/hlsl-intrinsic/scalar-uint64.slang.4 (vk)
tests/hlsl-intrinsic/vector-double-reduced-intrinsic.slang.3 (vk)
@@ -76,9 +43,6 @@ tests/hlsl-intrinsic/wave-shuffle-vk.slang.3 (vk)
tests/hlsl-intrinsic/wave-vector.slang.3 (vk)
tests/hlsl-intrinsic/wave.slang.3 (vk)
tests/hlsl-intrinsic/active-mask/switch.slang.3 (vk)
-tests/hlsl-intrinsic/bit-cast/bit-cast-16-bit.slang.1 (vk)
-tests/hlsl-intrinsic/byte-address-buffer/byte-address-16bit-vector.slang.2 (vk)
-tests/hlsl-intrinsic/byte-address-buffer/byte-address-16bit.slang.2 (vk)
tests/hlsl-intrinsic/size-of/align-of-3.slang.3 (vk)
tests/hlsl-intrinsic/size-of/size-of-3.slang.3 (vk)
tests/hlsl-intrinsic/wave-mask/wave-active-product.slang.3 (vk)
@@ -94,12 +58,7 @@ tests/hlsl-intrinsic/wave-mask/wave-read-lane-at-vk.slang.1 (vk)
tests/hlsl-intrinsic/wave-mask/wave-shuffle-vk.slang.3 (vk)
tests/hlsl-intrinsic/wave-mask/wave-vector.slang.3 (vk)
tests/hlsl-intrinsic/wave-mask/wave.slang.3 (vk)
-tests/ir/string-literal-hash.slang.1 (vk)
tests/language-feature/constants/constexpr-loop.slang.1 (vk)
-tests/language-feature/initializer-lists/default-init-16bit-types.slang (vk)
-tests/language-feature/shader-params/interface-shader-param-ordinary.slang.2 (vk)
-tests/language-feature/swizzles/matrix-swizzle-write-array.slang.1 (vk)
-tests/language-feature/swizzles/matrix-swizzle-write-swizzle.slang.1 (vk)
tests/optimization/func-resource-result/func-resource-result-complex.slang.1 (vk)
tests/slang-extension/atomic-float-byte-address-buffer.slang.2 (vk)
tests/slang-extension/atomic-int64-byte-address-buffer.slang.4 (vk)
@@ -107,5 +66,4 @@ tests/slang-extension/atomic-min-max-u64-byte-address-buffer.slang.4 (vk)
tests/slang-extension/cas-int64-byte-address-buffer.slang.4 (vk)
tests/slang-extension/exchange-int64-byte-address-buffer.slang.4 (vk)
tests/slang-extension/realtime-clock.slang.2 (vk)
-tests/spirv/spirv-instruction.slang (vk)
tests/type/texture-sampler/texture-sampler-2d.slang (vk) \ No newline at end of file
diff --git a/tests/vkray/raygen.slang.glsl b/tests/vkray/raygen.slang.glsl
index 28bd5956b..69dc74c53 100644
--- a/tests/vkray/raygen.slang.glsl
+++ b/tests/vkray/raygen.slang.glsl
@@ -2,24 +2,6 @@
#extension GL_EXT_ray_tracing : require
layout(row_major) uniform;
layout(row_major) buffer;
-struct ReflectionRay_0
-{
- float color_1;
-};
-
-layout(location = 0)
-rayPayloadEXT
-ReflectionRay_0 p_0;
-
-struct ShadowRay_0
-{
- float hitDistance_0;
-};
-
-layout(location = 1)
-rayPayloadEXT
-ShadowRay_0 p_1;
-
layout(binding = 0)
uniform texture2D samplerPosition_0;
@@ -49,7 +31,32 @@ layout(std140) uniform _S1
vec4 viewPos_0;
mat4x4 view_0;
mat4x4 model_0;
-} ubo_0;
+}ubo_0;
+layout(binding = 5)
+uniform accelerationStructureEXT as_0;
+
+layout(rgba32f)
+layout(binding = 4)
+uniform image2D outputImage_0;
+
+struct ReflectionRay_0
+{
+ float color_1;
+};
+
+layout(location = 0)
+rayPayloadEXT
+ReflectionRay_0 p_0;
+
+struct ShadowRay_0
+{
+ float hitDistance_0;
+};
+
+layout(location = 1)
+rayPayloadEXT
+ShadowRay_0 p_1;
+
struct RayDesc_0
{
vec3 Origin_0;
@@ -74,18 +81,11 @@ void TraceRay_1(accelerationStructureEXT AccelerationStructure_1, uint RayFlags_
return;
}
-layout(binding = 5)
-uniform accelerationStructureEXT as_0;
-
float saturate_0(float x_0)
{
return clamp(x_0, 0.0, 1.0);
}
-layout(rgba32f)
-layout(binding = 4)
-uniform image2D outputImage_0;
-
void main()
{
uvec3 _S2 = ((gl_LaunchIDEXT));