From 79d106fac18f5792fcac448a0b037aa834fa6042 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 14 May 2021 17:32:52 -0400 Subject: Fix for KernelContext threading issue for C++ targets (#1843) * #include an absolute path didn't work - because paths were taken to always be relative. * Fix for issue where threading KernelContext was not working on C++ test when there were multiple invocations. * Improve test for context threading. --- tests/current-bugs/cpp-resource-issue.slang | 40 ----------------------------- 1 file changed, 40 deletions(-) delete mode 100644 tests/current-bugs/cpp-resource-issue.slang (limited to 'tests/current-bugs/cpp-resource-issue.slang') diff --git a/tests/current-bugs/cpp-resource-issue.slang b/tests/current-bugs/cpp-resource-issue.slang deleted file mode 100644 index 13906ba95..000000000 --- a/tests/current-bugs/cpp-resource-issue.slang +++ /dev/null @@ -1,40 +0,0 @@ -// cpu-resource-issue.slang - -// Enable this test - and cpu C++ compilation of output fails. -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -compile-arg -O3 -xslang -matrix-layout-column-major -shaderobj - -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -compile-arg -O3 -xslang -matrix-layout-column-major -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -dx12 -xslang -matrix-layout-column-major -shaderobj -//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj - -//TEST_INPUT:cbuffer(data=[1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0 0.0 10.0 20.0 30.0 1.0]):name matrixBuffer -ConstantBuffer matrixBuffer; - -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name rowOrderMatrixOutput -RWStructuredBuffer rowOrderMatrixOutput; - -void writeRow(float4 v, int rowIndex) -{ - int baseIndex = rowIndex * 4; - - rowOrderMatrixOutput[baseIndex + 0] = v.x; - rowOrderMatrixOutput[baseIndex + 1] = v.y; - rowOrderMatrixOutput[baseIndex + 2] = v.z; - rowOrderMatrixOutput[baseIndex + 3] = v.w; -} - -[numthreads(1, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) -{ - float4 v = float4(1, 2, 3, 1); - - float4x4 M = matrixBuffer; - - float4 r = mul(v, M); - - writeRow(M[0], 0); - writeRow(M[1], 1); - writeRow(M[2], 2); - writeRow(M[3], 3); -} -- cgit v1.2.3