commit 2b538b85b874539e68b2b5f0d96c7deeab69745e
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:09 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 5f0ab790bfd35cdc536dfd296488cd0dda91f7cf
parent c2141fb314ecb6aa36861de57b7744649e51ea1b

Rename some constants in BlockLayoutEncoder for clarity.

TRAC #23748

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

src/compiler/BlockLayoutEncoder.cpp

diff --git a/src/compiler/BlockLayoutEncoder.cpp b/src/compiler/BlockLayoutEncoder.cpp
index 15aee6c..ca5b471 100644
--- a/src/compiler/BlockLayoutEncoder.cpp
+++ b/src/compiler/BlockLayoutEncoder.cpp
@@ -50,7 +50,7 @@
     ASSERT(field.fields.empty());
     getBlockLayoutInfo(field.type, field.arraySize, field.isRowMajorMatrix, &arrayStride, &matrixStride);
 
-    const BlockMemberInfo memberInfo(mCurrentOffset * ComponentSize, arrayStride * ComponentSize, matrixStride * ComponentSize, field.isRowMajorMatrix);
+    const BlockMemberInfo memberInfo(mCurrentOffset * BytesPerComponent, arrayStride * BytesPerComponent, matrixStride * BytesPerComponent, field.isRowMajorMatrix);
 
     if (mBlockInfoOut)
     {
@@ -67,7 +67,7 @@
 
     getBlockLayoutInfo(type, arraySize, isRowMajorMatrix, &arrayStride, &matrixStride);
 
-    const BlockMemberInfo memberInfo(mCurrentOffset * ComponentSize, arrayStride * ComponentSize, matrixStride * ComponentSize, isRowMajorMatrix);
+    const BlockMemberInfo memberInfo(mCurrentOffset * BytesPerComponent, arrayStride * BytesPerComponent, matrixStride * BytesPerComponent, isRowMajorMatrix);
 
     if (mBlockInfoOut)
     {
@@ -79,7 +79,7 @@
 
 void BlockLayoutEncoder::nextRegister()
 {
-    mCurrentOffset = rx::roundUp(mCurrentOffset, RegisterSize);
+    mCurrentOffset = rx::roundUp(mCurrentOffset, ComponentsPerRegister);
 }
 
 Std140BlockEncoder::Std140BlockEncoder(std::vector<BlockMemberInfo> *blockInfoOut)
@@ -100,7 +100,7 @@
 void Std140BlockEncoder::getBlockLayoutInfo(GLenum type, unsigned int arraySize, bool isRowMajorMatrix, int *arrayStrideOut, int *matrixStrideOut)
 {
     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
-    ASSERT(gl::UniformComponentSize(gl::UniformComponentType(type)) == ComponentSize);
+    ASSERT(gl::UniformComponentSize(gl::UniformComponentType(type)) == BytesPerComponent);
 
     int numComponents = gl::UniformComponentCount(type);
     size_t baseAlignment = 0;
@@ -109,19 +109,19 @@
 
     if (gl::IsMatrixType(type))
     {
-        baseAlignment = RegisterSize;
-        matrixStride = RegisterSize;
+        baseAlignment = ComponentsPerRegister;
+        matrixStride = ComponentsPerRegister;
 
         if (arraySize > 0)
         {
             const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
-            arrayStride = RegisterSize * numRegisters;
+            arrayStride = ComponentsPerRegister * numRegisters;
         }
     }
     else if (arraySize > 0)
     {
-        baseAlignment = RegisterSize;
-        arrayStride = RegisterSize;
+        baseAlignment = ComponentsPerRegister;
+        arrayStride = ComponentsPerRegister;
     }
     else
     {
@@ -143,9 +143,9 @@
     }
     else if (gl::IsMatrixType(type))
     {
-        ASSERT(matrixStride == RegisterSize);
+        ASSERT(matrixStride == ComponentsPerRegister);
         const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
-        mCurrentOffset += RegisterSize * numRegisters;
+        mCurrentOffset += ComponentsPerRegister * numRegisters;
     }
     else
     {