From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: Replace std::vector into macro STD_VECTOR. In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features. --- src/render/modernopenglgraphics.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/render/modernopenglgraphics.cpp') diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index f034cdc65..6950f4555 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -589,11 +589,11 @@ inline void ModernOpenGLGraphics::drawVertexes(const OpenGLGraphicsVertexes & restrict ogl) restrict2 { - const std::vector &vp = ogl.mVp; - const std::vector &vbos = ogl.mVbo; - std::vector::const_iterator ivp; - std::vector::const_iterator ivbo; - const std::vector::const_iterator ivp_end = vp.end(); + const STD_VECTOR &vp = ogl.mVp; + const STD_VECTOR &vbos = ogl.mVbo; + STD_VECTOR::const_iterator ivp; + STD_VECTOR::const_iterator ivbo; + const STD_VECTOR::const_iterator ivp_end = vp.end(); /* if (vp.size() != vbos.size()) @@ -1286,14 +1286,14 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert) if (vert == nullptr) return; OpenGLGraphicsVertexes &ogl = vert->ogl; - const std::vector &vp = ogl.mVp; - std::vector::const_iterator ivp; - const std::vector::const_iterator ivp_end = vp.end(); - std::vector &intTexPool = ogl.mIntTexPool; - std::vector::const_iterator ft; - const std::vector::const_iterator ft_end = intTexPool.end(); - std::vector &vbos = ogl.mVbo; - std::vector::const_iterator ivbo; + const STD_VECTOR &vp = ogl.mVp; + STD_VECTOR::const_iterator ivp; + const STD_VECTOR::const_iterator ivp_end = vp.end(); + STD_VECTOR &intTexPool = ogl.mIntTexPool; + STD_VECTOR::const_iterator ft; + const STD_VECTOR::const_iterator ft_end = intTexPool.end(); + STD_VECTOR &vbos = ogl.mVbo; + STD_VECTOR::const_iterator ivbo; const int sz = CAST_S32(intTexPool.size()); vbos.resize(sz); @@ -1316,7 +1316,7 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert) *ft, GL_STATIC_DRAW); } - for (std::vector::iterator it = intTexPool.begin(); + for (STD_VECTOR::iterator it = intTexPool.begin(); it != intTexPool.end(); ++ it) { delete [] (*it); -- cgit v1.2.3-70-g09d2