diff options
| author | Sverker Eriksson <[email protected]> | 2016-01-28 16:27:34 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-01-28 16:27:34 +0100 |
| commit | 8be1fad4075eba013a811c6879e3a906f365d3d4 (patch) | |
| tree | 300e8a413408f9cea0acfe41e76a4c66ef2d18fb /lib/wx/src/gen/glu.erl | |
| parent | 042677624b1d7b3f4c99be4e1483180e7fe8b2c0 (diff) | |
| parent | 632eb0ee2fbad692255ca2b1d0c3300fd0b6e492 (diff) | |
| download | otp-8be1fad4075eba013a811c6879e3a906f365d3d4.tar.gz otp-8be1fad4075eba013a811c6879e3a906f365d3d4.tar.bz2 otp-8be1fad4075eba013a811c6879e3a906f365d3d4.zip | |
Merge branch 'master' into sverk/hipe-line-table-bug/master/OTP-13282
Diffstat (limited to 'lib/wx/src/gen/glu.erl')
| -rw-r--r-- | lib/wx/src/gen/glu.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl index 6a6e20b3e4..5faba48930 100644 --- a/lib/wx/src/gen/glu.erl +++ b/lib/wx/src/gen/glu.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2015. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -51,10 +51,14 @@ -define(GLint64,64/native-signed). -type vertex() :: {float(), float(), float()}. -type enum() :: non_neg_integer(). %% See wx/include/gl.hrl or glu.hrl --type matrix() :: {float(),float(),float(),float(), +-type matrix12() :: {float(),float(),float(),float(), + float(),float(),float(),float(), + float(),float(),float(),float()}. +-type matrix16() :: {float(),float(),float(),float(), float(),float(),float(),float(), float(),float(),float(),float(), float(),float(),float(),float()}. +-type matrix() :: matrix12() | matrix16(). -type mem() :: binary() | tuple(). %% Memory block -export([tesselate/2,build1DMipmapLevels/9,build1DMipmaps/6,build2DMipmapLevels/10, |