diff --git a/doc/pages.doxy b/doc/pages.doxy index d83a542c..871dbd0f 100644 --- a/doc/pages.doxy +++ b/doc/pages.doxy @@ -28,3 +28,25 @@ These pages are the API reference only. For more information about how to use GLM, please have a look at the manual. **/ + +/*! + \page pg_differences Differences between GLSL and GLM core + + GLM comes very close to replicating GLSL, but it is not exact. Here is a list of + differences between GLM and GLSL: + + +**/ diff --git a/glm/core/func_exponential.hpp b/glm/core/func_exponential.hpp index b36a13ad..d0787663 100644 --- a/glm/core/func_exponential.hpp +++ b/glm/core/func_exponential.hpp @@ -44,6 +44,7 @@ namespace glm /// Returns x raised to the y power. /// /// @param x pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision. + /// @param y /// @tparam genType Floating-point scalar or vector types. /// /// @see - GLSL pow man page diff --git a/glm/gtx/constants.hpp b/glm/gtx/constants.hpp index 013f1e7d..b3a908e9 100644 --- a/glm/gtx/constants.hpp +++ b/glm/gtx/constants.hpp @@ -20,7 +20,7 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref constants +/// @ref gtx_constants /// @file glm/gtx/constants.hpp /// @date 2011-09-30 / 2011-09-30 /// @author Christophe Riccio diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index e0f10dcf..7ad8dc9c 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -60,8 +60,8 @@ namespace glm //! Returns the log2 of x. Can be reliably using to compute mipmap count from the texture size. //! From GLM_GTX_integer extension. - template - genType log2(genType const & x); + template + genIUType log2(genIUType const & x); //! Returns the floor log2 of x. //! From GLM_GTX_integer extension.