From 8bebe2b4629577e3c2b3fc80dcfb3d803c77a587 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 28 May 2018 21:52:52 -0700 Subject: Moved Stride to vertex layout desc; updated tests --- Tests/TestApp/assets/TestComputeShaders.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Tests/TestApp/assets/TestComputeShaders.lua') 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 -- cgit v1.2.3