From 2c2294d3310b24fd73cd41ec51338a736f3a2886 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 5 Sep 2023 23:26:59 +0800 Subject: 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 --- tests/bugs/gh-941.slang.glsl | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/gh-941.slang.glsl b/tests/bugs/gh-941.slang.glsl index 4330ece53..111cdb33c 100644 --- a/tests/bugs/gh-941.slang.glsl +++ b/tests/bugs/gh-941.slang.glsl @@ -1,9 +1,7 @@ -//TEST_IGNORE_FILE: - #version 450 - #extension GL_EXT_nonuniform_qualifier : require - +layout(row_major) uniform; +layout(row_major) buffer; struct SLANG_ParameterGroup_C_0 { vec2 uv_0; @@ -11,15 +9,13 @@ struct SLANG_ParameterGroup_C_0 }; layout(binding = 2) -layout(std140) -uniform _S1 +layout(std140) uniform _S1 { vec2 uv_0; uint index_0; -} C_0; - +}C_0; layout(binding = 0) -uniform texture2D t_0[]; +uniform texture2D t_0[]; layout(binding = 1) uniform sampler s_0; @@ -29,11 +25,7 @@ out vec4 _S2; void main() { - vec4 _S3 = texture( - sampler2D( - t_0[C_0.index_0], - s_0), - C_0.uv_0); - _S2 = _S3; + _S2 = (texture(sampler2D(t_0[C_0.index_0],s_0), (C_0.uv_0))); return; -} \ No newline at end of file +} + -- cgit v1.2.3