Fixed some function signatures Fixed a few types in function signatures so that base and derived classes signatures match. Change-Id: Ide9b9c78ff05be785b512451a36c836f35bd1f3d Reviewed-on: https://swiftshader-review.googlesource.com/5463 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Renderer/Renderer.cpp b/src/Renderer/Renderer.cpp index 252d744..32e2027 100644 --- a/src/Renderer/Renderer.cpp +++ b/src/Renderer/Renderer.cpp
@@ -2474,9 +2474,9 @@ loadConstants(shader); } - void Renderer::setPixelShaderConstantF(int index, const float value[4], int count) + void Renderer::setPixelShaderConstantF(unsigned int index, const float value[4], unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->psDirtyConstF < index + count) { @@ -2484,16 +2484,16 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { PixelProcessor::setFloatConstant(index + i, value); value += 4; } } - void Renderer::setPixelShaderConstantI(int index, const int value[4], int count) + void Renderer::setPixelShaderConstantI(unsigned int index, const int value[4], unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->psDirtyConstI < index + count) { @@ -2501,16 +2501,16 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { PixelProcessor::setIntegerConstant(index + i, value); value += 4; } } - void Renderer::setPixelShaderConstantB(int index, const int *boolean, int count) + void Renderer::setPixelShaderConstantB(unsigned int index, const int *boolean, unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->psDirtyConstB < index + count) { @@ -2518,16 +2518,16 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { PixelProcessor::setBooleanConstant(index + i, *boolean); boolean++; } } - void Renderer::setVertexShaderConstantF(int index, const float value[4], int count) + void Renderer::setVertexShaderConstantF(unsigned int index, const float value[4], unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->vsDirtyConstF < index + count) { @@ -2535,16 +2535,16 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { VertexProcessor::setFloatConstant(index + i, value); value += 4; } } - void Renderer::setVertexShaderConstantI(int index, const int value[4], int count) + void Renderer::setVertexShaderConstantI(unsigned int index, const int value[4], unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->vsDirtyConstI < index + count) { @@ -2552,16 +2552,16 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { VertexProcessor::setIntegerConstant(index + i, value); value += 4; } } - void Renderer::setVertexShaderConstantB(int index, const int *boolean, int count) + void Renderer::setVertexShaderConstantB(unsigned int index, const int *boolean, unsigned int count) { - for(int i = 0; i < DRAW_COUNT; i++) + for(unsigned int i = 0; i < DRAW_COUNT; i++) { if(drawCall[i]->vsDirtyConstB < index + count) { @@ -2569,7 +2569,7 @@ } } - for(int i = 0; i < count; i++) + for(unsigned int i = 0; i < count; i++) { VertexProcessor::setBooleanConstant(index + i, *boolean); boolean++;