commit a26bade15dc97294ed8795a7780a2b6abd4ce76e
author Nicolas Capens <capn@google.com> Fri May 27 13:19:49 2016 -0400
committer Nicolas Capens <capn@google.com> Sat May 28 15:09:35 2016 +0000
tree 1a9457e90aa0b800ad6e3b771576f798604317f7
parent 53318fa7bc4e80d9a599d0e09afcecea2a7766f0

Use static_assert instead of meta macros.

Change-Id: Id1e3a50d56475c495a3cfb82553c5bd4c48a0fc3
Reviewed-on: https://swiftshader-review.googlesource.com/5425
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/D3D9/Capabilities.hpp

diff --git a/src/D3D9/Capabilities.hpp b/src/D3D9/Capabilities.hpp
index 768ad1d..27bf193 100644
--- a/src/D3D9/Capabilities.hpp
+++ b/src/D3D9/Capabilities.hpp
@@ -16,7 +16,6 @@
 #define D3D9_Capabilities_hpp
 
 #include "Config.hpp"
-#include "MetaMacro.hpp"
 
 #include <d3d9.h>
 
@@ -479,18 +478,18 @@
 	};
 
 	// Shader Model 3.0 requirements
-	META_ASSERT(MAX_VERTEX_SHADER_CONST >= 256);
-	META_ASSERT(MAX_PIXEL_SHADER_CONST == 224);
-	META_ASSERT(MAX_VERTEX_INPUTS == 16);
-	META_ASSERT(MAX_VERTEX_OUTPUTS == 12);
-	META_ASSERT(MAX_PIXEL_INPUTS == 10);
+	static_assert(MAX_VERTEX_SHADER_CONST >= 256, "");
+	static_assert(MAX_PIXEL_SHADER_CONST == 224, "");
+	static_assert(MAX_VERTEX_INPUTS == 16, "");
+	static_assert(MAX_VERTEX_OUTPUTS == 12, "");
+	static_assert(MAX_PIXEL_INPUTS == 10, "");
 
 	// Back-end minimum requirements
-	META_ASSERT(sw::VERTEX_UNIFORM_VECTORS >= MAX_VERTEX_SHADER_CONST);
-	META_ASSERT(sw::FRAGMENT_UNIFORM_VECTORS >= MAX_PIXEL_SHADER_CONST);
-	META_ASSERT(sw::MAX_VERTEX_INPUTS >= MAX_VERTEX_INPUTS);
-	META_ASSERT(sw::MAX_VERTEX_OUTPUTS >= MAX_VERTEX_OUTPUTS);
-	META_ASSERT(sw::MAX_FRAGMENT_INPUTS >= MAX_PIXEL_INPUTS);
+	static_assert(sw::VERTEX_UNIFORM_VECTORS >= MAX_VERTEX_SHADER_CONST, "");
+	static_assert(sw::FRAGMENT_UNIFORM_VECTORS >= MAX_PIXEL_SHADER_CONST, "");
+	static_assert(sw::MAX_VERTEX_INPUTS >= MAX_VERTEX_INPUTS, "");
+	static_assert(sw::MAX_VERTEX_OUTPUTS >= MAX_VERTEX_OUTPUTS, "");
+	static_assert(sw::MAX_FRAGMENT_INPUTS >= MAX_PIXEL_INPUTS, "");
 }
 
 #endif   // D3D9_Capabilities_hpp