1 files changed, 26 insertions, 30 deletions

diff --git a/tools/gfx-unit-test/existing-device-handle-test.cpp b/tools/gfx-unit-test/existing-device-handle-test.cpp
index 047128bdd..d87090aa0 100644
--- a/tools/gfx-unit-test/existing-device-handle-test.cpp
+++ b/tools/gfx-unit-test/existing-device-handle-test.cpp
@@ -19,7 +19,7 @@ namespace gfx_test
 
         ComPtr<IShaderProgram> shaderProgram;
         slang::ProgramLayout* slangReflection;
-        GFX_CHECK_CALL_ABORT(loadComputeProgram(device, shaderProgram, "compute-smoke", "computeMain", slangReflection));
+        GFX_CHECK_CALL_ABORT(loadComputeProgram(device, shaderProgram, "compute-trivial", "computeMain", slangReflection));
 
         ComputePipelineStateDesc pipelineDesc = {};
         pipelineDesc.program = shaderProgram.get();
@@ -64,24 +64,9 @@ namespace gfx_test
 
             auto rootObject = encoder->bindPipeline(pipelineState);
 
-            slang::TypeReflection* addTransformerType =
-                slangReflection->findTypeByName("AddTransformer");
-
-            // Now we can use this type to create a shader object that can be bound to the root object.
-            ComPtr<IShaderObject> transformer;
-            GFX_CHECK_CALL_ABORT(device->createShaderObject(
-                addTransformerType, ShaderObjectContainerType::None, transformer.writeRef()));
-            // Set the `c` field of the `AddTransformer`.
-            float c = 1.0f;
-            ShaderCursor(transformer).getPath("c").setData(&c, sizeof(float));
-
-            ShaderCursor entryPointCursor(
-                rootObject->getEntryPoint(0)); // get a cursor the the first entry-point.
-            // Bind buffer view to the entry point.
-            entryPointCursor.getPath("buffer").setResource(bufferView);
-
-            // Bind the previously created transformer object to root object.
-            entryPointCursor.getPath("transformer").setObject(transformer);
+            ShaderCursor rootCursor(rootObject);
+            // Bind buffer view to the root.
+            rootCursor.getPath("buffer").setResource(bufferView);
 
             encoder->dispatchCompute(1, 1, 1);
             encoder->endEncoding();
@@ -93,7 +78,7 @@ namespace gfx_test
         compareComputeResult(
             device,
             numbersBuffer,
-            Slang::makeArray<float>(11.0f, 12.0f, 13.0f, 14.0f));
+            Slang::makeArray<float>(1.0f, 2.0f, 3.0f, 4.0f));
     }
 
     void existingDeviceHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api)
@@ -106,15 +91,15 @@ namespace gfx_test
         IDevice::Desc deviceDesc = {};
         switch (api)
         {
-        case Slang::RenderApiFlag::D3D11:
-            deviceDesc.deviceType = gfx::DeviceType::DirectX11;
-            break;
         case Slang::RenderApiFlag::D3D12:
             deviceDesc.deviceType = gfx::DeviceType::DirectX12;
             break;
         case Slang::RenderApiFlag::Vulkan:
             deviceDesc.deviceType = gfx::DeviceType::Vulkan;
             break;
+        case Slang::RenderApiFlag::CUDA:
+            deviceDesc.deviceType = gfx::DeviceType::CUDA;
+            break;
         default:
             SLANG_IGNORE_TEST;
         }
@@ -123,23 +108,28 @@ namespace gfx_test
         deviceDesc.slang.searchPathCount = (SlangInt)SLANG_COUNT_OF(searchPaths);
         deviceDesc.slang.searchPaths = searchPaths;
         auto createDeviceResult = gfxCreateDevice(&deviceDesc, device.writeRef());
-        if (SLANG_FAILED(createDeviceResult))
+        if (SLANG_FAILED(createDeviceResult) || !device)
         {
             SLANG_IGNORE_TEST;
         }
 
-        IDevice::NativeHandle handle = {};
-        GFX_CHECK_CALL_ABORT(device->getNativeHandle(&handle));
+        IDevice::InteropHandles handles;
+        GFX_CHECK_CALL_ABORT(device->getNativeDeviceHandles(&handles));
         Slang::ComPtr<IDevice> testDevice;
         IDevice::Desc testDeviceDesc = deviceDesc;
-        testDeviceDesc.existingDeviceHandles = handle;
+        testDeviceDesc.existingDeviceHandles.handles[0] = handles.handles[0];
+        if (api == Slang::RenderApiFlag::Vulkan)
+        {
+            testDeviceDesc.existingDeviceHandles.handles[1] = handles.handles[1];
+            testDeviceDesc.existingDeviceHandles.handles[2] = handles.handles[2];
+        }
         auto createTestDeviceResult = gfxCreateDevice(&testDeviceDesc, testDevice.writeRef());
-        if (SLANG_FAILED(createTestDeviceResult))
+        if (SLANG_FAILED(createTestDeviceResult) || !device)
         {
             SLANG_IGNORE_TEST;
         }
 
-        existingDeviceHandleTestImpl(testDevice, context);
+        existingDeviceHandleTestImpl(device, context);
     }
 
     SLANG_UNIT_TEST(existingDeviceHandleD3D12)
@@ -151,5 +141,11 @@ namespace gfx_test
     {
         return existingDeviceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::Vulkan);
     }
-
+#if 0
+    // Temporarily disabled due to inconsistent test results on TC
+    SLANG_UNIT_TEST(existingDeviceHandleCUDA)
+    {
+        return existingDeviceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::CUDA);
+    }
+#endif
 }