From 82198dc5b8284382d27d5f6776fb2531b805a83e Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 24 Nov 2018 11:15:28 -0800 Subject: Added explicit control over resource transitions in draw command Added explicit static resource binding initialization in SRB objects --- Tests/TestApp/assets/TestRenderScripts.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Tests/TestApp/assets/TestRenderScripts.lua') diff --git a/Tests/TestApp/assets/TestRenderScripts.lua b/Tests/TestApp/assets/TestRenderScripts.lua index a181c20..fe2519e 100644 --- a/Tests/TestApp/assets/TestRenderScripts.lua +++ b/Tests/TestApp/assets/TestRenderScripts.lua @@ -194,6 +194,8 @@ function BindShaderResources() MinimalVS:BindResources(ResMapping) MinimalInstVS:BindResources(ResMapping) UniformBufferPS:BindResources(ResMapping) + SRB:InitializeStaticResources(PSO) + SRBInst:InitializeStaticResources() end @@ -203,16 +205,16 @@ function DrawTris(DrawAttrs) Context.SetPipelineState(PSO) Context.SetVertexBuffers(0, VertexBuffer1, 0, ColorsBuffer1, 0, "SET_VERTEX_BUFFERS_FLAG_RESET") SRB:BindResources({"SHADER_TYPE_VERTEX", "SHADER_TYPE_PIXEL"}, ResMapping, {"BIND_SHADER_RESOURCES_KEEP_EXISTING", "BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED", "BIND_SHADER_RESOURCES_UPDATE_ALL"}) - Context.TransitionShaderResources(PSO) - Context.CommitShaderResources() + Context.TransitionShaderResources(PSO, SRB) + Context.CommitShaderResources(SRB) Context.Draw(DrawAttrs) else Context.SetPipelineState(PSOInst) Context.SetVertexBuffers(0, VertexBuffer2, ColorsBuffer2, 0, InstanceBuffer, 0, "SET_VERTEX_BUFFERS_FLAG_RESET") Context.SetIndexBuffer(IndexBuffer) SRBInst:BindResources({"SHADER_TYPE_VERTEX", "SHADER_TYPE_PIXEL"}, ResMapping, {"BIND_SHADER_RESOURCES_KEEP_EXISTING", "BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED", "BIND_SHADER_RESOURCES_UPDATE_MUTABLE", "BIND_SHADER_RESOURCES_UPDATE_DYNAMIC"}) - Context.TransitionShaderResources(PSOInst) - Context.CommitShaderResources() + Context.TransitionShaderResources(PSOInst, SRBInst) + Context.CommitShaderResources(SRBInst) Context.Draw(DrawAttrs) end -- cgit v1.2.3