diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-05-29 04:52:52 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-05-29 04:52:52 +0000 |
| commit | 8bebe2b4629577e3c2b3fc80dcfb3d803c77a587 (patch) | |
| tree | 2e99b4c2170f9802cd840921f2cac496970e2ba8 /Tests/TestApp/assets | |
| parent | Updated multiple tests (diff) | |
| download | DiligentEngine-8bebe2b4629577e3c2b3fc80dcfb3d803c77a587.tar.gz DiligentEngine-8bebe2b4629577e3c2b3fc80dcfb3d803c77a587.zip | |
Moved Stride to vertex layout desc; updated tests
Diffstat (limited to 'Tests/TestApp/assets')
| -rw-r--r-- | Tests/TestApp/assets/LuaTest.lua | 4 | ||||
| -rw-r--r-- | Tests/TestApp/assets/TestComputeShaders.lua | 6 | ||||
| -rw-r--r-- | Tests/TestApp/assets/TestRenderScripts.lua | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Tests/TestApp/assets/LuaTest.lua b/Tests/TestApp/assets/LuaTest.lua index 1d73590..e9025b1 100644 --- a/Tests/TestApp/assets/LuaTest.lua +++ b/Tests/TestApp/assets/LuaTest.lua @@ -420,8 +420,8 @@ TestBuffer3 = Buffer.Create( } ) -Context.SetVertexBuffers(1, TestBuffer, 0, 4, TestBuffer3, 16, 8, "SET_VERTEX_BUFFERS_FLAG_RESET") -Context.SetVertexBuffers(1, TestBuffer, 0, 4, nil) +Context.SetVertexBuffers(1, TestBuffer, 0, TestBuffer3, 16, "SET_VERTEX_BUFFERS_FLAG_RESET") +Context.SetVertexBuffers(1, TestBuffer, 0, nil) Context.SetVertexBuffers(nil, nil, nil, {"SET_VERTEX_BUFFERS_FLAG_RESET", "SET_VERTEX_BUFFERS_FLAG_RESET"}) TestBuffer3 = Buffer.Create({ diff --git a/Tests/TestApp/assets/TestComputeShaders.lua b/Tests/TestApp/assets/TestComputeShaders.lua index 3f8c6e4..85cc46b 100644 --- a/Tests/TestApp/assets/TestComputeShaders.lua +++ b/Tests/TestApp/assets/TestComputeShaders.lua @@ -235,8 +235,8 @@ RenderPSO = PipelineState.Create pPS = RenderPS, InputLayout = { - { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false}, - { InputIndex = 1, BufferSlot = 1, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false} + { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false, Stride = 4*4}, + { InputIndex = 1, BufferSlot = 1, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Stride = 4*4} }, RTVFormats = {"TEX_FORMAT_RGBA8_UNORM_SRGB"}, PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP" @@ -264,7 +264,7 @@ function Draw() Context.SetPipelineState(RenderPSO) Context.TransitionShaderResources(RenderPSO) Context.CommitShaderResources() - Context.SetVertexBuffers(PositionsBuffer, 0, 4*4, TexcoordBuffer, TexcoordDataOffset, 4*4, "SET_VERTEX_BUFFERS_FLAG_RESET") + Context.SetVertexBuffers(PositionsBuffer, 0, TexcoordBuffer, TexcoordDataOffset, "SET_VERTEX_BUFFERS_FLAG_RESET") Context.SetIndexBuffer(IndexBuffer) Context.Draw(DrawAttrs) end diff --git a/Tests/TestApp/assets/TestRenderScripts.lua b/Tests/TestApp/assets/TestRenderScripts.lua index c3a37a3..090c374 100644 --- a/Tests/TestApp/assets/TestRenderScripts.lua +++ b/Tests/TestApp/assets/TestRenderScripts.lua @@ -115,9 +115,9 @@ PSOInst = PipelineState.Create }, InputLayout = { - { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false}, - { InputIndex = 1, BufferSlot = 1, NumComponents = 4, ValueType = "VT_UINT8", IsNormalized = true}, - { InputIndex = 2, BufferSlot = 2, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Frequency = "FREQUENCY_PER_INSTANCE"}, + { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false, Stride = 4*3}, + { InputIndex = 1, BufferSlot = 1, NumComponents = 4, ValueType = "VT_UINT8", IsNormalized = true, Stride = 4*1}, + { InputIndex = 2, BufferSlot = 2, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Frequency = "FREQUENCY_PER_INSTANCE", Stride = 0}, }, PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST", pVS = MinimalInstVS, @@ -209,14 +209,14 @@ function DrawTris(DrawAttrs) if( DrawAttrs.NumInstances == 1 ) then Context.SetPipelineState(PSO) - Context.SetVertexBuffers(0, VertexBuffer1, 0, 4*3, ColorsBuffer1, 0, 1*4, "SET_VERTEX_BUFFERS_FLAG_RESET") + Context.SetVertexBuffers(0, VertexBuffer1, 0, ColorsBuffer1, 0, "SET_VERTEX_BUFFERS_FLAG_RESET") SRB:BindResources({"SHADER_TYPE_VERTEX", "SHADER_TYPE_PIXEL"}, ResMapping, {"BIND_SHADER_RESOURCES_UPDATE_UNRESOLVED", "BIND_SHADER_RESOURCES_ALL_RESOLVED"}) Context.TransitionShaderResources(PSO) Context.CommitShaderResources() Context.Draw(DrawAttrs) else Context.SetPipelineState(PSOInst) - Context.SetVertexBuffers(0, VertexBuffer2, ColorsBuffer2, 0, 1*4, InstanceBuffer, 0, "SET_VERTEX_BUFFERS_FLAG_RESET") + 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_UPDATE_UNRESOLVED", "BIND_SHADER_RESOURCES_ALL_RESOLVED"}) Context.TransitionShaderResources(PSOInst) |