From ebe8ddefc48478307d5f206cd3e40c41d28a36e3 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 26 Sep 2023 23:56:06 -0700 Subject: Various SPIRV fixes. (#3231) * Various SPIRV fixes. - Geometry shader support (WIP). - Fix texture get dimension and load. - Fold global GetElement(MakeArray/MakeVector) insts. - Call spvopt to inline all functions. - Translate OpImageSubscript. - Emit struct member names and global variable names. - Fix lowering of OpBitNot -> OpNot, instead of OpBitReverse. * Fix test. * Fix geometry shader. * Fix geometry shader emit. * Add atomic Image access test. * Fix tests. * don't fail if spirv-opt fails. * Update comments. * Fix test. * Cleanups. * indentation --------- Co-authored-by: Yong He Co-authored-by: Ellie Hermaszewska --- tests/cross-compile/texture-load.slang.glsl | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'tests/cross-compile') diff --git a/tests/cross-compile/texture-load.slang.glsl b/tests/cross-compile/texture-load.slang.glsl index d9145cdbf..7d080a3cb 100644 --- a/tests/cross-compile/texture-load.slang.glsl +++ b/tests/cross-compile/texture-load.slang.glsl @@ -1,13 +1,8 @@ -// texture-load.slang.glsl -//TEST_IGNORE_FILE: - #version 450 - +#extension GL_EXT_samplerless_texture_functions : require layout(row_major) uniform; layout(row_major) buffer; -#extension GL_EXT_samplerless_texture_functions : require - struct SLANG_ParameterGroup_C_0 { ivec2 pos_0; @@ -31,16 +26,6 @@ layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in; void main() { ivec3 _S2 = ivec3(C_0.pos_0, 0); - - vec2 tmp_0 = texelFetch( - inputTexture_0, - _S2.xy, - _S2.z).xy; - - imageStore( - outputTexture_0, - ivec2(uvec2(C_0.pos_0)), - vec4(tmp_0, float(0), float(0))); - + imageStore((outputTexture_0), ivec2((uvec2(C_0.pos_0))), vec4((texelFetch((inputTexture_0), ((_S2)).xy, ((_S2)).z).xy), float(0), float(0))); return; } -- cgit v1.2.3