Cleanup.

include/bx/inline/sort.inl

@@ -9,21 +9,25 @@
 
 namespace bx
 {
-#define BX_RADIXSORT_BITS 11
-#define BX_RADIXSORT_HISTOGRAM_SIZE (1<<BX_RADIXSORT_BITS)
-#define BX_RADIXSORT_BIT_MASK (BX_RADIXSORT_HISTOGRAM_SIZE-1)
+	namespace radix_sort_detail
+	{
+		constexpr uint32_t kBits          = 11;
+		constexpr uint32_t kHistogramSize = 1<<kBits;
+		constexpr uint32_t kBitMask       = kHistogramSize-1;
+
+	} // namespace radix_sort_detail
 
 	inline void radixSort(uint32_t* _keys, uint32_t* _tempKeys, uint32_t _size)
 	{
 		uint32_t* keys = _keys;
 		uint32_t* tempKeys = _tempKeys;
 
-		uint32_t histogram[BX_RADIXSORT_HISTOGRAM_SIZE];
+		uint32_t histogram[radix_sort_detail::kHistogramSize];
 		uint16_t shift = 0;
 		uint32_t pass = 0;
 		for (; pass < 3; ++pass)
 		{
-			memSet(histogram, 0, sizeof(uint32_t)*BX_RADIXSORT_HISTOGRAM_SIZE);
+			memSet(histogram, 0, sizeof(uint32_t)*radix_sort_detail::kHistogramSize);
 
 			bool sorted = true;
 			{
@@ -32,7 +36,7 @@ namespace bx
 				for (uint32_t ii = 0; ii < _size; ++ii, prevKey = key)
 				{
 					key = keys[ii];
-					uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+					uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 					++histogram[index];
 					sorted &= prevKey <= key;
 				}
@@ -44,7 +48,7 @@ namespace bx
 			}
 
 			uint32_t offset = 0;
-			for (uint32_t ii = 0; ii < BX_RADIXSORT_HISTOGRAM_SIZE; ++ii)
+			for (uint32_t ii = 0; ii < radix_sort_detail::kHistogramSize; ++ii)
 			{
 				uint32_t count = histogram[ii];
 				histogram[ii] = offset;
@@ -54,7 +58,7 @@ namespace bx
 			for (uint32_t ii = 0; ii < _size; ++ii)
 			{
 				uint32_t key = keys[ii];
-				uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+				uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 				uint32_t dest = histogram[index]++;
 				tempKeys[dest] = key;
 			}
@@ -63,7 +67,7 @@ namespace bx
 			tempKeys = keys;
 			keys = swapKeys;
 
-			shift += BX_RADIXSORT_BITS;
+			shift += radix_sort_detail::kBits;
 		}
 
 done:
@@ -82,12 +86,12 @@ done:
 		Ty* values = _values;
 		Ty* tempValues = _tempValues;
 
-		uint32_t histogram[BX_RADIXSORT_HISTOGRAM_SIZE];
+		uint32_t histogram[radix_sort_detail::kHistogramSize];
 		uint16_t shift = 0;
 		uint32_t pass = 0;
 		for (; pass < 3; ++pass)
 		{
-			memSet(histogram, 0, sizeof(uint32_t)*BX_RADIXSORT_HISTOGRAM_SIZE);
+			memSet(histogram, 0, sizeof(uint32_t)*radix_sort_detail::kHistogramSize);
 
 			bool sorted = true;
 			{
@@ -96,7 +100,7 @@ done:
 				for (uint32_t ii = 0; ii < _size; ++ii, prevKey = key)
 				{
 					key = keys[ii];
-					uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+					uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 					++histogram[index];
 					sorted &= prevKey <= key;
 				}
@@ -108,7 +112,7 @@ done:
 			}
 
 			uint32_t offset = 0;
-			for (uint32_t ii = 0; ii < BX_RADIXSORT_HISTOGRAM_SIZE; ++ii)
+			for (uint32_t ii = 0; ii < radix_sort_detail::kHistogramSize; ++ii)
 			{
 				uint32_t count = histogram[ii];
 				histogram[ii] = offset;
@@ -118,7 +122,7 @@ done:
 			for (uint32_t ii = 0; ii < _size; ++ii)
 			{
 				uint32_t key = keys[ii];
-				uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+				uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 				uint32_t dest = histogram[index]++;
 				tempKeys[dest] = key;
 				tempValues[dest] = values[ii];
@@ -132,7 +136,7 @@ done:
 			tempValues = values;
 			values = swapValues;
 
-			shift += BX_RADIXSORT_BITS;
+			shift += radix_sort_detail::kBits;
 		}
 
 done:
@@ -152,12 +156,12 @@ done:
 		uint64_t* keys = _keys;
 		uint64_t* tempKeys = _tempKeys;
 
-		uint32_t histogram[BX_RADIXSORT_HISTOGRAM_SIZE];
+		uint32_t histogram[radix_sort_detail::kHistogramSize];
 		uint16_t shift = 0;
 		uint32_t pass = 0;
 		for (; pass < 6; ++pass)
 		{
-			memSet(histogram, 0, sizeof(uint32_t)*BX_RADIXSORT_HISTOGRAM_SIZE);
+			memSet(histogram, 0, sizeof(uint32_t)*radix_sort_detail::kHistogramSize);
 
 			bool sorted = true;
 			{
@@ -166,7 +170,7 @@ done:
 				for (uint32_t ii = 0; ii < _size; ++ii, prevKey = key)
 				{
 					key = keys[ii];
-					uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+					uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 					++histogram[index];
 					sorted &= prevKey <= key;
 				}
@@ -178,7 +182,7 @@ done:
 			}
 
 			uint32_t offset = 0;
-			for (uint32_t ii = 0; ii < BX_RADIXSORT_HISTOGRAM_SIZE; ++ii)
+			for (uint32_t ii = 0; ii < radix_sort_detail::kHistogramSize; ++ii)
 			{
 				uint32_t count = histogram[ii];
 				histogram[ii] = offset;
@@ -188,7 +192,7 @@ done:
 			for (uint32_t ii = 0; ii < _size; ++ii)
 			{
 				uint64_t key = keys[ii];
-				uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+				uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 				uint32_t dest = histogram[index]++;
 				tempKeys[dest] = key;
 			}
@@ -197,7 +201,7 @@ done:
 			tempKeys = keys;
 			keys = swapKeys;
 
-			shift += BX_RADIXSORT_BITS;
+			shift += radix_sort_detail::kBits;
 		}
 
 done:
@@ -216,12 +220,12 @@ done:
 		Ty* values = _values;
 		Ty* tempValues = _tempValues;
 
-		uint32_t histogram[BX_RADIXSORT_HISTOGRAM_SIZE];
+		uint32_t histogram[radix_sort_detail::kHistogramSize];
 		uint16_t shift = 0;
 		uint32_t pass = 0;
 		for (; pass < 6; ++pass)
 		{
-			memSet(histogram, 0, sizeof(uint32_t)*BX_RADIXSORT_HISTOGRAM_SIZE);
+			memSet(histogram, 0, sizeof(uint32_t)*radix_sort_detail::kHistogramSize);
 
 			bool sorted = true;
 			{
@@ -230,7 +234,7 @@ done:
 				for (uint32_t ii = 0; ii < _size; ++ii, prevKey = key)
 				{
 					key = keys[ii];
-					uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+					uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 					++histogram[index];
 					sorted &= prevKey <= key;
 				}
@@ -242,7 +246,7 @@ done:
 			}
 
 			uint32_t offset = 0;
-			for (uint32_t ii = 0; ii < BX_RADIXSORT_HISTOGRAM_SIZE; ++ii)
+			for (uint32_t ii = 0; ii < radix_sort_detail::kHistogramSize; ++ii)
 			{
 				uint32_t count = histogram[ii];
 				histogram[ii] = offset;
@@ -252,7 +256,7 @@ done:
 			for (uint32_t ii = 0; ii < _size; ++ii)
 			{
 				uint64_t key = keys[ii];
-				uint16_t index = (key>>shift)&BX_RADIXSORT_BIT_MASK;
+				uint16_t index = (key>>shift)&radix_sort_detail::kBitMask;
 				uint32_t dest = histogram[index]++;
 				tempKeys[dest] = key;
 				tempValues[dest] = values[ii];
@@ -266,7 +270,7 @@ done:
 			tempValues = values;
 			values = swapValues;
 
-			shift += BX_RADIXSORT_BITS;
+			shift += radix_sort_detail::kBits;
 		}
 
 done:
@@ -281,8 +285,4 @@ done:
 		}
 	}
 
-#undef BX_RADIXSORT_BITS
-#undef BX_RADIXSORT_HISTOGRAM_SIZE
-#undef BX_RADIXSORT_BIT_MASK
-
 } // namespace bx