Merge branch 'dev/ralston/explicit_vectors_2' into 'main'

Explicit Vector Constructor Fix See merge request lightspeedrtx/dxvk-remix-nv!768
NVIDIAGameWorks · Apr 2, 2024 · 7814e6d · 7814e6d
2 parents 7e24a52 + 126e845
commit 7814e6d
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/util/util_matrix.h b/src/util/util_matrix.h
@@ -35,18 +35,18 @@ namespace dxvk {
 
     // Identity
     inline Matrix4Base() {
-      data[0] = { 1, 0, 0, 0 };
-      data[1] = { 0, 1, 0, 0 };
-      data[2] = { 0, 0, 1, 0 };
-      data[3] = { 0, 0, 0, 1 };
+      data[0] = Vector4Base<T>{ 1, 0, 0, 0 };
+      data[1] = Vector4Base<T>{ 0, 1, 0, 0 };
+      data[2] = Vector4Base<T>{ 0, 0, 1, 0 };
+      data[3] = Vector4Base<T>{ 0, 0, 0, 1 };
     }
 
     // Produces a scalar matrix, x * Identity
     inline explicit Matrix4Base(T x) {
-      data[0] = { x, 0, 0, 0 };
-      data[1] = { 0, x, 0, 0 };
-      data[2] = { 0, 0, x, 0 };
-      data[3] = { 0, 0, 0, x };
+      data[0] = Vector4Base<T>{ x, 0, 0, 0 };
+      data[1] = Vector4Base<T>{ 0, x, 0, 0 };
+      data[2] = Vector4Base<T>{ 0, 0, x, 0 };
+      data[3] = Vector4Base<T>{ 0, 0, 0, x };
     }
 
     inline Matrix4Base(
@@ -91,9 +91,9 @@ namespace dxvk {
     }
 
     explicit inline Matrix4Base(const Vector3Base<T> translation) {
-      data[0] = { 1, 0, 0, 0 };
-      data[1] = { 0, 1, 0, 0 };
-      data[2] = { 0, 0, 1, 0 };
+      data[0] = Vector4Base<T>{ 1, 0, 0, 0 };
+      data[1] = Vector4Base<T>{ 0, 1, 0, 0 };
+      data[2] = Vector4Base<T>{ 0, 0, 1, 0 };
       data[3] = Vector4Base<T>(translation.x, translation.y, translation.z, 1.f);
     }
 
@@ -440,16 +440,16 @@ namespace dxvk {
 
     // Identity
     inline Matrix3() {
-      data[0] = { 1, 0, 0 };
-      data[1] = { 0, 1, 0 };
-      data[2] = { 0, 0, 1 };
+      data[0] = Vector3{ 1, 0, 0 };
+      data[1] = Vector3{ 0, 1, 0 };
+      data[2] = Vector3{ 0, 0, 1 };
     }
 
     // Produces a scalar matrix, x * Identity
     inline explicit Matrix3(float x) {
-      data[0] = { x, 0, 0 };
-      data[1] = { 0, x, 0 };
-      data[2] = { 0, 0, x };
+      data[0] = Vector3{ x, 0, 0 };
+      data[1] = Vector3{ 0, x, 0 };
+      data[2] = Vector3{ 0, 0, x };
     }
 
     inline Matrix3(