summaryrefslogtreecommitdiffstats
path: root/tests/bindings
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-09-05 23:26:59 +0800
committerGitHub <noreply@github.com>2023-09-05 23:26:59 +0800
commit2c2294d3310b24fd73cd41ec51338a736f3a2886 (patch)
tree0e02393fa772e7741eb38079a79f5cacaa1ba7b0 /tests/bindings
parent641f7bdc4ea4f75385c30d833cce4619a411ec67 (diff)
SPIR-V image operations (#3163)
* Add __truncate and __sampledType for spirv_asm Allows some texture tests to start passing * add __isVector Currently unused * Add 1-vector legalization pass (WIP) * Add capabilities for image types * neaten instruction dumping * add 1-vector test * Add a couple of cases to vec1 legalization * Remove texture tests from expected failures * comment * regenerate vs projects * Remove redundant define form synchapi emulation * refactoring image methods * All sample functions refactored * Remove incorrect glsl intrinsics Partially addresses https://github.com/shader-slang/slang/issues/3174 * __subscript image ops via writing funcs * Extract texture struct writing from core.meta.slang * Abstract out cuda intrinsic * Remvoe erroneous call to opDecorateIndex * spirv asm IR utils * Correct position of loads for SPIR-V asm inst operands * Raise constructors to global scope during spir-v legalization * Correct snippet output * Implement most texture sampling ops for SPIR-V * Legalize 1-vectors for glsl too * Make SPIR-V inst operands non-hoistable * Better 1-vector legalization * Put textures in ptrs for spirv * insert missing break * Add vec1 legalization test * Add some missing pieces to slang-ir-insts * Greatly neaten vec1 legalization * a * Neaten vec1 legalization * Add image read and write intrinsics for spir-v * Squash warnings * regenerate vs projects * Drop redundant guards * Drop 5 tests from expected failure list * Inst numbering changes to cross compile tests * vec1 legalization tests only on vk * Correct location of asm op emit * Inline constant in spirv-asm * Correct signedness for lane in wave intrinsics * Extract element from float1 for cuda * squash warnings * Neaten spirv-emit * dedupe more capabilities * warnings * neaten assert * comments * comments
Diffstat (limited to 'tests/bindings')
-rw-r--r--tests/bindings/glsl-parameter-blocks.slang.glsl21
1 files changed, 1 insertions, 20 deletions
diff --git a/tests/bindings/glsl-parameter-blocks.slang.glsl b/tests/bindings/glsl-parameter-blocks.slang.glsl
index fbeddb905..c00ed8fe3 100644
--- a/tests/bindings/glsl-parameter-blocks.slang.glsl
+++ b/tests/bindings/glsl-parameter-blocks.slang.glsl
@@ -1,50 +1,31 @@
#version 450
layout(row_major) uniform;
layout(row_major) buffer;
-
-#line 3 "tests/bindings/glsl-parameter-blocks.slang"
struct Test_0
{
vec4 a_0;
};
-
-#line 7
layout(binding = 0)
layout(std140) uniform _S1
{
vec4 a_0;
}gTest_0;
-
-#line 3
layout(binding = 1)
uniform texture2D gTest_t_0;
-
-#line 1237 "core.meta.slang"
layout(binding = 2)
uniform sampler gTest_s_0;
-
-#line 89 "core"
layout(location = 0)
out vec4 _S2;
-
-#line 902 "core.meta.slang"
layout(location = 0)
in vec2 _S3;
-
-#line 12 "tests/bindings/glsl-parameter-blocks.slang"
void main()
{
- vec4 _S4 = (texture(sampler2D(gTest_t_0,gTest_s_0), (_S3)));
-
-#line 14
- _S2 = gTest_0.a_0 + _S4;
-
-#line 14
+ _S2 = gTest_0.a_0 + (texture(sampler2D(gTest_t_0,gTest_s_0), (_S3)));
return;
}