diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2018-08-27 12:37:52 +0300 |
---|---|---|
committer | Aleksey Belousov <beloal@users.noreply.github.com> | 2018-09-25 12:33:08 +0300 |
commit | a81f1fc4d1f698a0f0aaaa1e7a29f41516b05d11 (patch) | |
tree | cf7c511247ca2ae4da08e2a11d2b22232846a3da /drape/vertex_array_buffer.cpp | |
parent | 5cca83542d89b081d668bccca7bf14c5c8c165ad (diff) |
[drape][metal] Added states.
Diffstat (limited to 'drape/vertex_array_buffer.cpp')
-rw-r--r-- | drape/vertex_array_buffer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp index aeea0b67f8..a1c26b0818 100644 --- a/drape/vertex_array_buffer.cpp +++ b/drape/vertex_array_buffer.cpp @@ -1,7 +1,7 @@ #include "drape/vertex_array_buffer.hpp" -#include "drape/glextensions_list.hpp" -#include "drape/glfunctions.hpp" +#include "drape/gl_extensions_list.hpp" +#include "drape/gl_functions.hpp" #include "drape/index_storage.hpp" #include "drape/support_manager.hpp" @@ -34,7 +34,6 @@ std::pair<uint32_t, uint32_t> CalculateMappingPart(std::vector<dp::MutateNode> c VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBufferSize) : m_VAO(0) , m_dataBufferSize(dataBufferSize) - , m_program() , m_isPreflushed(false) , m_moveToGpuOnBuild(false) , m_isChanged(false) @@ -97,7 +96,7 @@ void VertexArrayBuffer::RenderRange(bool drawAsLine, IndicesRange const & range) { if (!(m_staticBuffers.empty() && m_dynamicBuffers.empty()) && GetIndexCount() > 0) { - ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad")); + ASSERT(m_program != nullptr, ("Build must be called before RenderRange")); // If OES_vertex_array_object is supported than all bindings have already saved in VAO // and we need only bind VAO. if (!Bind()) @@ -118,7 +117,7 @@ void VertexArrayBuffer::Build(ref_ptr<GpuProgram> program) if (m_moveToGpuOnBuild && !m_isPreflushed) PreflushImpl(); - if (m_VAO != 0 && m_program == program) + if (m_VAO != 0 && m_program.get() == program.get()) return; m_program = program; |