Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing signed/unsigned comparisons

Browse source
This commit is contained in:
Bradley Austin Davis 2015-08-05 13:47:36 -07:00
parent 754bf5c6f7
commit 649b9d6ce9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu/src/gpu/GLBackend.h
View file

@ -336,7 +336,7 @@ protected:
// Uniform Stage // Uniform Stage
void do_setUniformBuffer(Batch& batch, uint32 paramOffset); void do_setUniformBuffer(Batch& batch, uint32 paramOffset);
void releaseUniformBuffer(int slot); void releaseUniformBuffer(uint32_t slot);
void resetUniformStage(); void resetUniformStage();
struct UniformStageState { struct UniformStageState {
Buffers _buffers; Buffers _buffers;
@ -349,7 +349,7 @@ protected:
// Resource Stage // Resource Stage
void do_setResourceTexture(Batch& batch, uint32 paramOffset); void do_setResourceTexture(Batch& batch, uint32 paramOffset);
void releaseResourceTexture(int slot); void releaseResourceTexture(uint32_t slot);
void resetResourceStage(); void resetResourceStage();
struct ResourceStageState { struct ResourceStageState {
Textures _textures; Textures _textures;

6
libraries/gpu/src/gpu/GLBackendInput.cpp
View file

@ -81,7 +81,7 @@ void GLBackend::killInput() {
} }
void GLBackend::syncInputStateCache() { 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; GLint active = 0;
glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &active); glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &active);
_input._attributeActivation[i] = active; _input._attributeActivation[i] = active;
@ -244,7 +244,7 @@ void GLBackend::resetInputStage() {
glBindBuffer(GL_ARRAY_BUFFER, 0); 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); glDisableVertexAttribArray(i);
glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0); glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0);
} }
@ -254,7 +254,7 @@ void GLBackend::resetInputStage() {
_input._invalidFormat = false; _input._invalidFormat = false;
_input._attributeActivation.reset(); _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._buffers[i].reset();
_input._bufferOffsets[i] = 0; _input._bufferOffsets[i] = 0;
_input._bufferStrides[i] = 0; _input._bufferStrides[i] = 0;

8
libraries/gpu/src/gpu/GLBackendPipeline.cpp
View file

@ -147,7 +147,7 @@ void GLBackend::resetPipelineStage() {
} }
void GLBackend::releaseUniformBuffer(int slot) { void GLBackend::releaseUniformBuffer(uint32_t slot) {
#if (GPU_FEATURE_PROFILE == GPU_CORE) #if (GPU_FEATURE_PROFILE == GPU_CORE)
auto& buf = _uniform._buffers[slot]; auto& buf = _uniform._buffers[slot];
if (buf) { if (buf) {
@ -164,7 +164,7 @@ void GLBackend::releaseUniformBuffer(int slot) {
} }
void GLBackend::resetUniformStage() { void GLBackend::resetUniformStage() {
for (int i = 0; i < _uniform._buffers.size(); i++) { for (uint32_t i = 0; i < _uniform._buffers.size(); i++) {
releaseUniformBuffer(i); releaseUniformBuffer(i);
} }
} }
@ -217,7 +217,7 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) {
#endif #endif
} }
void GLBackend::releaseResourceTexture(int slot) { void GLBackend::releaseResourceTexture(uint32_t slot) {
auto& tex = _resource._textures[slot]; auto& tex = _resource._textures[slot];
if (tex) { if (tex) {
auto* object = Backend::getGPUObject<GLBackend::GLTexture>(*tex); auto* object = Backend::getGPUObject<GLBackend::GLTexture>(*tex);
@ -234,7 +234,7 @@ void GLBackend::releaseResourceTexture(int slot) {
} }
void GLBackend::resetResourceStage() { void GLBackend::resetResourceStage() {
for (int i = 0; i < _resource._textures.size(); i++) { for (uint32_t i = 0; i < _resource._textures.size(); i++) {
releaseResourceTexture(i); releaseResourceTexture(i);
} }
} }