summaryrefslogtreecommitdiff
path: root/src/render/vertexes/openglgraphicsvertexes.h
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/vertexes/openglgraphicsvertexes.h
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadplus-311c175f3184103950c72bc5c775174597430b83.tar.gz
plus-311c175f3184103950c72bc5c775174597430b83.tar.bz2
plus-311c175f3184103950c72bc5c775174597430b83.tar.xz
plus-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/vertexes/openglgraphicsvertexes.h')
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h
index dd05c7e1c..023abf139 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -56,16 +56,16 @@ class OpenGLGraphicsVertexes final
GLshort *switchShortVertArray() restrict2;
- std::vector<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED
{ return &mFloatTexPool; }
- std::vector<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED
{ return &mIntVertPool; }
- std::vector<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED
{ return &mShortVertPool; }
- std::vector<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED
{ return &mIntTexPool; }
void switchVp(const int n) restrict2;
@@ -82,7 +82,7 @@ class OpenGLGraphicsVertexes final
void updateVp(const int n) restrict2;
- std::vector<int> *getVp() restrict2 A_WARN_UNUSED
+ STD_VECTOR<int> *getVp() restrict2 A_WARN_UNUSED
{ return &mVp; }
void init() restrict2;
@@ -95,12 +95,12 @@ class OpenGLGraphicsVertexes final
GLint *mIntTexArray;
GLint *mIntVertArray;
GLshort *mShortVertArray;
- std::vector<int> mVp;
- std::vector<GLfloat*> mFloatTexPool;
- std::vector<GLint*> mIntVertPool;
- std::vector<GLshort*> mShortVertPool;
- std::vector<GLint*> mIntTexPool;
- std::vector<GLuint> mVbo;
+ STD_VECTOR<int> mVp;
+ STD_VECTOR<GLfloat*> mFloatTexPool;
+ STD_VECTOR<GLint*> mIntVertPool;
+ STD_VECTOR<GLshort*> mShortVertPool;
+ STD_VECTOR<GLint*> mIntTexPool;
+ STD_VECTOR<GLuint> mVbo;
};
extern unsigned int vertexBufSize;