MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

quadarray.h: Use size_t for everything (quad) count related

Browse source
This commit is contained in:
Jonas Kulla 2014-08-12 19:46:30 +02:00
parent 7d30ce1a00
commit 18022bf809
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/quadarray.h
View file

@ -40,7 +40,7 @@ struct QuadArray
VBO::ID vbo; VBO::ID vbo;
GLMeta::VAO vao; GLMeta::VAO vao;
int quadCount; size_t quadCount;
GLsizeiptr vboSize; GLsizeiptr vboSize;
QuadArray() QuadArray()
@ -62,7 +62,7 @@ struct QuadArray
VBO::del(vbo); VBO::del(vbo);
} }
void resize(int size) void resize(size_t size)
{ {
vertices.resize(size * 4); vertices.resize(size * 4);
quadCount = size; quadCount = size;
@ -115,7 +115,7 @@ struct QuadArray
draw(0, quadCount); draw(0, quadCount);
} }
int count() const size_t count() const
{ {
return quadCount; return quadCount;
} }

2
src/sharedstate.cpp
View file

@ -238,7 +238,7 @@ void SharedState::setBindingData(void *data)
p->bindingData = data; p->bindingData = data;
} }
void SharedState::ensureQuadIBO(int minSize) void SharedState::ensureQuadIBO(size_t minSize)
{ {
_globalIBO->ensureSize(minSize); _globalIBO->ensureSize(minSize);
} }

2
src/sharedstate.h
View file

@ -92,7 +92,7 @@ struct SharedState
/* Returns global quad IBO, and ensures it has indices /* Returns global quad IBO, and ensures it has indices
* for at least minSize quads */ * for at least minSize quads */
void ensureQuadIBO(int minSize); void ensureQuadIBO(size_t minSize);
GlobalIBO &globalIBO(); GlobalIBO &globalIBO();
/* Global general purpose texture */ /* Global general purpose texture */