diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2015-03-11 18:43:00 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:04:06 +0300 |
| commit | a5a47250859188bd425ec4397d51d9d51f8b1cc7 (patch) | |
| tree | 4d709751eaaaf46f6ecc64d0a4f0e7411ee02404 /drape_head | |
| parent | 79c730e51d0d3995d372fb144d40ae56b1e915b1 (diff) | |
[drape] review fixes
Diffstat (limited to 'drape_head')
| -rw-r--r-- | drape_head/testing_engine.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index 5140845798..8242ed1ab0 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -55,14 +55,15 @@ public: for (gui::StaticLabel::Vertex & v : result.m_buffer) v.m_position = glsl::vec3(glsl::ToVec2(m_base), v.m_position.z); - dp::AttributeProvider provider(1, result.m_buffer.size()); - provider.InitStream(0, gui::StaticLabel::Vertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(result.m_buffer.data())); + dp::AttributeProvider provider(1 /* streamCount */, result.m_buffer.size()); + provider.InitStream(0 /* streamIndex */, gui::StaticLabel::Vertex::GetBindingInfo(), + dp::MakeStackRefPointer<void>(result.m_buffer.data())); dp::GLState state(gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer); state.SetColorTexture(result.m_colorTexture); state.SetMaskTexture(result.m_maskTexture); - batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4); + batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4 /* vertexStride */); } private: @@ -100,8 +101,10 @@ public: ASSERT_EQUAL(statData.size(), dynData.size(), ()); dp::AttributeProvider provider(2, dynData.size()); - provider.InitStream(0, gui::MutableLabel::StaticVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(statData.data())); - provider.InitStream(1, gui::MutableLabel::DynamicVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(dynData.data())); + provider.InitStream(0 /* streamIndex */, gui::MutableLabel::StaticVertex::GetBindingInfo(), + dp::MakeStackRefPointer<void>(statData.data())); + provider.InitStream(1 /* streamIndex */, gui::MutableLabel::DynamicVertex::GetBindingInfo(), + dp::MakeStackRefPointer<void>(dynData.data())); dp::GLState state(gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer); state.SetColorTexture(colorTexure); |