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 /Projects | |
| parent | Updated multiple tests (diff) | |
| download | DiligentEngine-8bebe2b4629577e3c2b3fc80dcfb3d803c77a587.tar.gz DiligentEngine-8bebe2b4629577e3c2b3fc80dcfb3d803c77a587.zip | |
Moved Stride to vertex layout desc; updated tests
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Asteroids/src/asteroids_DE.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp index 74b5dd5..45e52f5 100644 --- a/Projects/Asteroids/src/asteroids_DE.cpp +++ b/Projects/Asteroids/src/asteroids_DE.cpp @@ -171,7 +171,7 @@ Asteroids::Asteroids(const Settings &settings, AsteroidsSimulation* asteroids, G { PipelineStateDesc PSODesc; LayoutElement inputDesc[] = { - LayoutElement( 0, 0, 3, VT_FLOAT32), + LayoutElement( 0, 0, 3, VT_FLOAT32, false, 0, sizeof(Vertex)), LayoutElement( 1, 0, 3, VT_FLOAT32) }; @@ -655,9 +655,8 @@ void Asteroids::RenderSubset(Diligent::Uint32 SubsetNum, { IBuffer* ia_buffers[] = { mVertexBuffer }; - Uint32 ia_strides[] = { sizeof(Vertex) }; Uint32 ia_offsets[] = { 0 }; - pCtx->SetVertexBuffers(0, 1, ia_buffers, ia_strides, ia_offsets, 0); + pCtx->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0); pCtx->SetIndexBuffer(mIndexBuffer, 0); } @@ -787,9 +786,8 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting } IBuffer* ia_buffers[] = { mSkyboxVertexBuffer }; - UINT ia_strides[] = { sizeof(SkyboxVertex) }; UINT ia_offsets[] = { 0 }; - mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_strides, ia_offsets, 0); + mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0); mDeviceCtxt->SetPipelineState(mSkyboxPSO); mDeviceCtxt->CommitShaderResources(nullptr, COMMIT_SHADER_RESOURCES_FLAG_TRANSITION_RESOURCES); @@ -817,9 +815,8 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting } IBuffer* ia_buffers[] = { mSpriteVertexBuffer }; - Uint32 ia_strides[] = { sizeof(SpriteVertex) }; Uint32 ia_offsets[] = { 0 }; - mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_strides, ia_offsets, 0); + mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0); // Draw UINT vertexStart = 0; |