Backed out changeset 318f32313091 (bug 1459526) for causing wrench bu…

…stages. CLOSED TREE [ghsync] From https://hg.mozilla.org/mozilla-central/rev/e239fd943fffbf2f6054835e009a7e25125007f2
servo · Jun 17, 2021 · 00659af · 00659af
1 parent 82bd870
commit 00659af
Show file tree

Hide file tree

Showing 15 changed files with 273 additions and 732 deletions.
diff --git a/glsl-to-cxx/src/hir.rs b/glsl-to-cxx/src/hir.rs
@@ -2260,10 +2260,7 @@ fn translate_expression(state: &mut State, e: &syntax::Expr) -> Expr {
                     match (lhs.ty.kind, rhs.ty.kind) {
                         (TypeKind::Mat2, TypeKind::Vec2) |
                         (TypeKind::Mat3, TypeKind::Vec3) |
-                        (TypeKind::Mat3, TypeKind::Mat3) |
-                        (TypeKind::Mat3, TypeKind::Mat43) |
                         (TypeKind::Mat4, TypeKind::Vec4) => rhs.ty.clone(),
-                        (TypeKind::Mat43, TypeKind::Vec4) => Type::new(TypeKind::Vec3),
                         (TypeKind::Mat2, TypeKind::Float) |
                         (TypeKind::Mat3, TypeKind::Float) |
                         (TypeKind::Mat4, TypeKind::Float) => lhs.ty.clone(),
@@ -2554,7 +2551,7 @@ fn translate_expression(state: &mut State, e: &syntax::Expr) -> Expr {
                             .fields
                             .iter()
                             .find(|x| &x.name == i)
-                            .expect(&format!("missing field `{}` in `{}`", i, sym.name));
+                            .expect("missing field");
                         Expr {
                             kind: ExprKind::Dot(e, i.clone()),
                             ty: field.ty.clone(),
@@ -3046,13 +3043,6 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
         Type::new(Vec4),
         vec![Type::new(Vec4)],
     );
-    declare_function(
-        state,
-        "vec4",
-        Some("make_vec4"),
-        Type::new(Vec4),
-        vec![Type::new(IVec4)],
-    );
 
     declare_function(
         state,
@@ -3238,35 +3228,6 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             Type::new(Float),
         ],
     );
-    declare_function(
-        state,
-        "mat3x4",
-        Some("make_mat3x4"),
-        Type::new(Mat34),
-        vec![
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-            Type::new(Float),
-        ],
-    );
-    declare_function(
-        state,
-        "transpose",
-        None,
-        Type::new(Mat43),
-        vec![Type::new(Mat34)],
-    );
     declare_function(
         state,
         "mat4",
@@ -4166,7 +4127,7 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             None,
             Type::new(Void),
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int)],
+                 Type::new(Int), Type::new(Int)],
         );
         declare_function(
             state,
@@ -4175,7 +4136,7 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             Type::new(Void),
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int)],
+                 Type::new(Int), Type::new(Int)],
         );
         declare_function(
             state,
@@ -4185,16 +4146,15 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int)],
+                 Type::new(Int), Type::new(Int)],
         );
         declare_function(
             state,
             "swgl_commitTextureLinearColorYUV",
             None,
             Type::new(Void),
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int),
-                 Type::new(Float)],
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
         );
         declare_function(
             state,
@@ -4203,8 +4163,7 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             Type::new(Void),
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int),
-                 Type::new(Float)],
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
         );
         declare_function(
             state,
@@ -4214,8 +4173,7 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
                  Type::new(*s), Type::new(Vec2), Type::new(Vec4),
-                 Type::new(Vec3), Type::new(Mat3), Type::new(Int),
-                 Type::new(Float)],
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
         );
     }