summaryrefslogtreecommitdiffstats
path: root/tools/gfx-unit-test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/gfx-unit-test')
-rw-r--r--tools/gfx-unit-test/nested-parameter-block.cpp5
-rw-r--r--tools/gfx-unit-test/root-mutable-shader-object.cpp10
-rw-r--r--tools/gfx-unit-test/root-shader-parameter.cpp3
-rw-r--r--tools/gfx-unit-test/sampler-array.cpp3
4 files changed, 8 insertions, 13 deletions
diff --git a/tools/gfx-unit-test/nested-parameter-block.cpp b/tools/gfx-unit-test/nested-parameter-block.cpp
index b21b0bcf2..774a94c5f 100644
--- a/tools/gfx-unit-test/nested-parameter-block.cpp
+++ b/tools/gfx-unit-test/nested-parameter-block.cpp
@@ -128,9 +128,8 @@ namespace gfx_test
auto commandBuffer = transientHeap->createCommandBuffer();
auto encoder = commandBuffer->encodeComputeCommands();
- auto rootObject = encoder->bindPipeline(pipelineState);
- rootObject->copyFrom(shaderObject, transientHeap);
-
+ encoder->bindPipelineWithRootObject(pipelineState, shaderObject);
+
encoder->dispatchCompute(1, 1, 1);
encoder->endEncoding();
commandBuffer->close();
diff --git a/tools/gfx-unit-test/root-mutable-shader-object.cpp b/tools/gfx-unit-test/root-mutable-shader-object.cpp
index 10079b62a..1d489786e 100644
--- a/tools/gfx-unit-test/root-mutable-shader-object.cpp
+++ b/tools/gfx-unit-test/root-mutable-shader-object.cpp
@@ -77,8 +77,7 @@ namespace gfx_test
auto commandBuffer = transientHeap->createCommandBuffer();
{
auto encoder = commandBuffer->encodeComputeCommands();
- auto root = encoder->bindPipeline(pipelineState);
- root->copyFrom(rootObject, transientHeap);
+ encoder->bindPipelineWithRootObject(pipelineState, rootObject);
encoder->dispatchCompute(1, 1, 1);
encoder->endEncoding();
}
@@ -92,8 +91,7 @@ namespace gfx_test
ShaderCursor(transformer).getPath("c").setData(&c, sizeof(float));
{
auto encoder = commandBuffer->encodeComputeCommands();
- auto root = encoder->bindPipeline(pipelineState);
- root->copyFrom(rootObject, transientHeap);
+ encoder->bindPipelineWithRootObject(pipelineState, rootObject);
encoder->dispatchCompute(1, 1, 1);
encoder->endEncoding();
}
@@ -114,8 +112,8 @@ namespace gfx_test
runTestImpl(mutableRootShaderObjectTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);
}
- SLANG_UNIT_TEST(mutableRootShaderObjectVulkan)
+ /*SLANG_UNIT_TEST(mutableRootShaderObjectVulkan)
{
runTestImpl(mutableRootShaderObjectTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);
- }
+ }*/
}
diff --git a/tools/gfx-unit-test/root-shader-parameter.cpp b/tools/gfx-unit-test/root-shader-parameter.cpp
index b01cb62f3..b13935c11 100644
--- a/tools/gfx-unit-test/root-shader-parameter.cpp
+++ b/tools/gfx-unit-test/root-shader-parameter.cpp
@@ -113,8 +113,7 @@ namespace gfx_test
auto commandBuffer = transientHeap->createCommandBuffer();
{
auto encoder = commandBuffer->encodeComputeCommands();
- auto root = encoder->bindPipeline(pipelineState);
- root->copyFrom(rootObject, transientHeap);
+ encoder->bindPipelineWithRootObject(pipelineState, rootObject);
encoder->dispatchCompute(1, 1, 1);
encoder->endEncoding();
}
diff --git a/tools/gfx-unit-test/sampler-array.cpp b/tools/gfx-unit-test/sampler-array.cpp
index 58e48e13d..945c31b07 100644
--- a/tools/gfx-unit-test/sampler-array.cpp
+++ b/tools/gfx-unit-test/sampler-array.cpp
@@ -138,8 +138,7 @@ namespace gfx_test
auto commandBuffer = transientHeap->createCommandBuffer();
{
auto encoder = commandBuffer->encodeComputeCommands();
- auto root = encoder->bindPipeline(pipelineState);
- root->copyFrom(rootObject, transientHeap);
+ encoder->bindPipelineWithRootObject(pipelineState, rootObject);
encoder->dispatchCompute(1, 1, 1);
encoder->endEncoding();
}