Replaced some hardcoded constants
Replaced values that matched with
FRAGMENT_UNIFORM_VECTORS or
VERTEX_UNIFORM_VECTORS where appropriate.
Change-Id: I64a72b6f30a8a553ea44c268e757ee529cff59fd
Reviewed-on: https://swiftshader-review.googlesource.com/3672
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/Device.cpp b/src/OpenGL/libGLESv2/Device.cpp
index 201bf00..d1a5672 100644
--- a/src/OpenGL/libGLESv2/Device.cpp
+++ b/src/OpenGL/libGLESv2/Device.cpp
@@ -125,14 +125,14 @@
vertexShaderDirty = true;
vertexShaderConstantsFDirty = 0;
- for(int i = 0; i < 224; i++)
+ for(int i = 0; i < FRAGMENT_UNIFORM_VECTORS; i++)
{
float zero[4] = {0, 0, 0, 0};
setPixelShaderConstantF(i, zero, 1);
}
- for(int i = 0; i < 256; i++)
+ for(int i = 0; i < VERTEX_UNIFORM_VECTORS; i++)
{
float zero[4] = {0, 0, 0, 0};
diff --git a/src/Renderer/PixelProcessor.cpp b/src/Renderer/PixelProcessor.cpp
index afbae78..146888d 100644
--- a/src/Renderer/PixelProcessor.cpp
+++ b/src/Renderer/PixelProcessor.cpp
@@ -75,7 +75,7 @@
void PixelProcessor::setFloatConstant(unsigned int index, const float value[4])
{
- if(index < 224)
+ if(index < FRAGMENT_UNIFORM_VECTORS)
{
c[index][0] = value[0];
c[index][1] = value[1];
diff --git a/src/Renderer/Renderer.cpp b/src/Renderer/Renderer.cpp
index 93c6bf1..c2abe55 100644
--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -79,11 +79,11 @@
{
queries = 0;
- vsDirtyConstF = 256 + 1;
+ vsDirtyConstF = VERTEX_UNIFORM_VECTORS + 1;
vsDirtyConstI = 16;
vsDirtyConstB = 16;
- psDirtyConstF = 224;
+ psDirtyConstF = FRAGMENT_UNIFORM_VECTORS;
psDirtyConstI = 16;
psDirtyConstB = 16;
@@ -434,7 +434,7 @@
{
data->ff = ff;
- draw->vsDirtyConstF = 256 + 1;
+ draw->vsDirtyConstF = VERTEX_UNIFORM_VECTORS + 1;
draw->vsDirtyConstI = 16;
draw->vsDirtyConstB = 16;
}
