From 649b9d6ce9736c0a8e6334df1528b789667ee151 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 5 Aug 2015 13:47:36 -0700 Subject: [PATCH] Fixing signed/unsigned comparisons --- libraries/gpu/src/gpu/GLBackend.h | 4 ++-- libraries/gpu/src/gpu/GLBackendInput.cpp | 6 +++--- libraries/gpu/src/gpu/GLBackendPipeline.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackend.h b/libraries/gpu/src/gpu/GLBackend.h index d2cf53106f..f3e3b1cc7c 100644 --- a/libraries/gpu/src/gpu/GLBackend.h +++ b/libraries/gpu/src/gpu/GLBackend.h @@ -336,7 +336,7 @@ protected: // Uniform Stage void do_setUniformBuffer(Batch& batch, uint32 paramOffset); - void releaseUniformBuffer(int slot); + void releaseUniformBuffer(uint32_t slot); void resetUniformStage(); struct UniformStageState { Buffers _buffers; @@ -349,7 +349,7 @@ protected: // Resource Stage void do_setResourceTexture(Batch& batch, uint32 paramOffset); - void releaseResourceTexture(int slot); + void releaseResourceTexture(uint32_t slot); void resetResourceStage(); struct ResourceStageState { Textures _textures; diff --git a/libraries/gpu/src/gpu/GLBackendInput.cpp b/libraries/gpu/src/gpu/GLBackendInput.cpp index 2faffe1c6c..efbead5da2 100755 --- a/libraries/gpu/src/gpu/GLBackendInput.cpp +++ b/libraries/gpu/src/gpu/GLBackendInput.cpp @@ -81,7 +81,7 @@ void GLBackend::killInput() { } void GLBackend::syncInputStateCache() { - for (int i = 0; i < _input._attributeActivation.size(); i++) { + for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) { GLint active = 0; glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &active); _input._attributeActivation[i] = active; @@ -244,7 +244,7 @@ void GLBackend::resetInputStage() { glBindBuffer(GL_ARRAY_BUFFER, 0); - for (int i = 0; i < _input._attributeActivation.size(); i++) { + for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) { glDisableVertexAttribArray(i); glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0); } @@ -254,7 +254,7 @@ void GLBackend::resetInputStage() { _input._invalidFormat = false; _input._attributeActivation.reset(); - for (int i = 0; i < _input._buffers.size(); i++) { + for (uint32_t i = 0; i < _input._buffers.size(); i++) { _input._buffers[i].reset(); _input._bufferOffsets[i] = 0; _input._bufferStrides[i] = 0; diff --git a/libraries/gpu/src/gpu/GLBackendPipeline.cpp b/libraries/gpu/src/gpu/GLBackendPipeline.cpp index a1245cf961..d0ed1d51bf 100755 --- a/libraries/gpu/src/gpu/GLBackendPipeline.cpp +++ b/libraries/gpu/src/gpu/GLBackendPipeline.cpp @@ -147,7 +147,7 @@ void GLBackend::resetPipelineStage() { } -void GLBackend::releaseUniformBuffer(int slot) { +void GLBackend::releaseUniformBuffer(uint32_t slot) { #if (GPU_FEATURE_PROFILE == GPU_CORE) auto& buf = _uniform._buffers[slot]; if (buf) { @@ -164,7 +164,7 @@ void GLBackend::releaseUniformBuffer(int slot) { } void GLBackend::resetUniformStage() { - for (int i = 0; i < _uniform._buffers.size(); i++) { + for (uint32_t i = 0; i < _uniform._buffers.size(); i++) { releaseUniformBuffer(i); } } @@ -217,7 +217,7 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) { #endif } -void GLBackend::releaseResourceTexture(int slot) { +void GLBackend::releaseResourceTexture(uint32_t slot) { auto& tex = _resource._textures[slot]; if (tex) { auto* object = Backend::getGPUObject(*tex); @@ -234,7 +234,7 @@ void GLBackend::releaseResourceTexture(int slot) { } void GLBackend::resetResourceStage() { - for (int i = 0; i < _resource._textures.size(); i++) { + for (uint32_t i = 0; i < _resource._textures.size(); i++) { releaseResourceTexture(i); } }