anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed build

Browse Source
master
Christophe Riccio ago%!(EXTRA string=9 years)
parent 3f74efa2e0
commit 8b9d205178
1 changed files with 0 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      glm/detail/type_vec4.inl

3
glm/detail/type_vec4.inl
Unescape View File

@ -68,7 +68,6 @@ namespace detail
return tvec4<T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w); return tvec4<T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w);
} }
}; };
<<<<<<< HEAD
template <typename T, precision P> template <typename T, precision P>
struct compute_vec4_mod struct compute_vec4_mod
@ -123,8 +122,6 @@ namespace detail
return tvec4<T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); return tvec4<T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w);
} }
}; };
=======
>>>>>>> simd
}//namespace detail }//namespace detail
// -- Implicit basic constructors -- // -- Implicit basic constructors --

Write Preview
Loading…
Cancel
Save