From 18022bf809c0edfb24634205e5b9a766499d2848 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Tue, 12 Aug 2014 19:46:30 +0200 Subject: [PATCH] quadarray.h: Use size_t for everything (quad) count related --- src/quadarray.h | 6 +++--- src/sharedstate.cpp | 2 +- src/sharedstate.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/quadarray.h b/src/quadarray.h index 66a44fb..f4037ed 100644 --- a/src/quadarray.h +++ b/src/quadarray.h @@ -40,7 +40,7 @@ struct QuadArray VBO::ID vbo; GLMeta::VAO vao; - int quadCount; + size_t quadCount; GLsizeiptr vboSize; QuadArray() @@ -62,7 +62,7 @@ struct QuadArray VBO::del(vbo); } - void resize(int size) + void resize(size_t size) { vertices.resize(size * 4); quadCount = size; @@ -115,7 +115,7 @@ struct QuadArray draw(0, quadCount); } - int count() const + size_t count() const { return quadCount; } diff --git a/src/sharedstate.cpp b/src/sharedstate.cpp index 6f430cc..f85a835 100644 --- a/src/sharedstate.cpp +++ b/src/sharedstate.cpp @@ -238,7 +238,7 @@ void SharedState::setBindingData(void *data) p->bindingData = data; } -void SharedState::ensureQuadIBO(int minSize) +void SharedState::ensureQuadIBO(size_t minSize) { _globalIBO->ensureSize(minSize); } diff --git a/src/sharedstate.h b/src/sharedstate.h index 686155f..ce787fa 100644 --- a/src/sharedstate.h +++ b/src/sharedstate.h @@ -92,7 +92,7 @@ struct SharedState /* Returns global quad IBO, and ensures it has indices * for at least minSize quads */ - void ensureQuadIBO(int minSize); + void ensureQuadIBO(size_t minSize); GlobalIBO &globalIBO(); /* Global general purpose texture */