summaryrefslogtreecommitdiff
path: root/src/render/modernopenglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/render/modernopenglgraphics.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmanaverse-311c175f3184103950c72bc5c775174597430b83.tar.gz
manaverse-311c175f3184103950c72bc5c775174597430b83.tar.bz2
manaverse-311c175f3184103950c72bc5c775174597430b83.tar.xz
manaverse-311c175f3184103950c72bc5c775174597430b83.zip
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.
Diffstat (limited to 'src/render/modernopenglgraphics.cpp')
-rw-r--r--src/render/modernopenglgraphics.cpp28
1 files changed, 14 insertions, 14 deletions
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<int> &vp = ogl.mVp;
- const std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<int>::const_iterator ivp;
- std::vector<GLuint>::const_iterator ivbo;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ const STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<int>::const_iterator ivp;
+ STD_VECTOR<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int>::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<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
- std::vector<GLint*> &intTexPool = ogl.mIntTexPool;
- std::vector<GLint*>::const_iterator ft;
- const std::vector<GLint*>::const_iterator ft_end = intTexPool.end();
- std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
+ STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool;
+ STD_VECTOR<GLint*>::const_iterator ft;
+ const STD_VECTOR<GLint*>::const_iterator ft_end = intTexPool.end();
+ STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<GLuint>::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<GLint*>::iterator it = intTexPool.begin();
+ for (STD_VECTOR<GLint*>::iterator it = intTexPool.begin();
it != intTexPool.end(); ++ it)
{
delete [] (*it);