commit 04c967a3f4090bb7b679ae0859d4f2806e1565ac
author Alexis Hetu <sugoi@google.com> Wed Jul 08 15:56:17 2015 -0400
committer Alexis Hétu <sugoi@google.com> Wed Jul 08 20:03:40 2015 +0000
tree 905d21f96e07e63f06c638b50a20ea813f754b64
parent 7df892dfa595dddaf841fbbc8ec320fa5dcb0932

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>

src/Renderer/PixelProcessor.cpp

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];

src/Renderer/Renderer.cpp

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;
 			}