diff options
| author | Yong He <yonghe@outlook.com> | 2021-07-08 13:30:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 16:30:17 -0400 |
| commit | 09950676b3f73bb9967aea183d27a30d63098475 (patch) | |
| tree | aba3e69b72554b07da1188fd44d5f3ce3d90da26 /examples/ray-tracing/main.cpp | |
| parent | 06c4926ec51ce9548f2dc44ee948a467d588def8 (diff) | |
Implement gfx inline ray tracing on D3D12. (#1902)
* Update VS projects to 2019.
* Empty commit to trigger build
* Implement gfx inline ray tracing on D3D12.
Diffstat (limited to 'examples/ray-tracing/main.cpp')
| -rw-r--r-- | examples/ray-tracing/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp index a5093ad18..ffeb4b056 100644 --- a/examples/ray-tracing/main.cpp +++ b/examples/ray-tracing/main.cpp @@ -287,7 +287,7 @@ void onMouseUp(platform::MouseEventArgs args) { isMouseDown = false; } Slang::Result initialize() { - initializeBase("Ray Tracing", 1024, 768, DeviceType::Vulkan); + initializeBase("Ray Tracing", 1024, 768); gWindow->events.mouseMove = [this](const platform::MouseEventArgs& e) { onMouseMove(e); }; gWindow->events.mouseUp = [this](const platform::MouseEventArgs& e) { onMouseUp(e); }; gWindow->events.mouseDown = [this](const platform::MouseEventArgs& e) { onMouseDown(e); }; @@ -297,14 +297,14 @@ Slang::Result initialize() IBufferResource::Desc vertexBufferDesc; vertexBufferDesc.type = IResource::Type::Buffer; vertexBufferDesc.sizeInBytes = kVertexCount * sizeof(Vertex); - vertexBufferDesc.defaultState = ResourceState::UnorderedAccess; + vertexBufferDesc.defaultState = ResourceState::ShaderResource; gVertexBuffer = gDevice->createBufferResource(vertexBufferDesc, &kVertexData[0]); if(!gVertexBuffer) return SLANG_FAIL; IBufferResource::Desc indexBufferDesc; indexBufferDesc.type = IResource::Type::Buffer; indexBufferDesc.sizeInBytes = kIndexCount * sizeof(int32_t); - indexBufferDesc.defaultState = ResourceState::UnorderedAccess; + indexBufferDesc.defaultState = ResourceState::ShaderResource; gIndexBuffer = gDevice->createBufferResource(indexBufferDesc, &kIndexData[0]); if (!gIndexBuffer) return SLANG_FAIL; @@ -325,7 +325,7 @@ Slang::Result initialize() IBufferResource::Desc transformBufferDesc; transformBufferDesc.type = IResource::Type::Buffer; transformBufferDesc.sizeInBytes = sizeof(float) * 16; - transformBufferDesc.defaultState = ResourceState::UnorderedAccess; + transformBufferDesc.defaultState = ResourceState::ShaderResource; float transformData[12] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f}; gTransformBuffer = gDevice->createBufferResource(transformBufferDesc, &transformData); @@ -439,7 +439,7 @@ Slang::Result initialize() instanceBufferDesc.type = IResource::Type::Buffer; instanceBufferDesc.sizeInBytes = instanceDescs.getCount() * sizeof(IAccelerationStructure::InstanceDesc); - instanceBufferDesc.defaultState = ResourceState::UnorderedAccess; + instanceBufferDesc.defaultState = ResourceState::ShaderResource; gInstanceBuffer = gDevice->createBufferResource(instanceBufferDesc, instanceDescs.getBuffer()); if (!gInstanceBuffer) return SLANG_FAIL; |