xrRender: use C++11 alignas instead of ALIGN macro

OpenXRay · Aug 11, 2017 · 2d8294e · 2d8294e
1 parent 1077e04
commit 2d8294e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h
@@ -127,7 +127,7 @@ class ECORE_API CBackend
     u32 vb_stride;
 
     // Pixel/Vertex constants
-    ALIGN(16) R_constants constants;
+    alignas(16) R_constants constants;
     R_constant_table* ctable;
 
     // Shaders/State

diff --git a/src/Layers/xrRenderDX9/dx9r_constants_cache.h b/src/Layers/xrRenderDX9/dx9r_constants_cache.h
@@ -5,8 +5,7 @@
 template <class T, u32 limit>
 class R_constant_cache
 {
-private:
-    ALIGN(16) svector<T, limit> array;
+    alignas(16) svector<T, limit> array;
     u32 lo, hi;
 
 public:
@@ -35,13 +34,11 @@ class R_constant_array
     typedef R_constant_cache<Ivector4, 16> t_i;
     typedef R_constant_cache<BOOL, 16> t_b;
 
-public:
-    ALIGN(16) t_f c_f;
+    alignas(16) t_f c_f;
     //	ALIGN(16)	t_i					c_i;
     //	ALIGN(16)	t_b					c_b;
     BOOL b_dirty;
 
-public:
     t_f& get_array_f() { return c_f; }
     //	t_i&					get_array_i		()	{ return c_i;	}
     //	t_b&					get_array_b		()	{ return c_b;	}
@@ -140,12 +137,11 @@ class R_constant_array
 class ECORE_API R_constants
 {
 public:
-    ALIGN(16) R_constant_array a_pixel;
-    ALIGN(16) R_constant_array a_vertex;
+    alignas(16) R_constant_array a_pixel;
+    alignas(16) R_constant_array a_vertex;
 
     void flush_cache();
 
-public:
     // fp, non-array versions
     ICF void set(R_constant* C, const Fmatrix& A)
     {