diff options
author | Dan Gudmundsson <[email protected]> | 2015-12-04 12:10:04 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-12-04 12:10:04 +0100 |
commit | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (patch) | |
tree | c9c8735eef6ff80854c2814010f54b30f3d7f50d /lib/wx/api_gen/gl_gen_erl.erl | |
parent | 7b57b86a78f668747cc28e1820a0e6e8474111ea (diff) | |
parent | 80483dcb40c382e38405204370dfac7a8b6513aa (diff) | |
download | otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.tar.gz otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.tar.bz2 otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.zip |
Merge branch 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maint
* dgud/wx/rewrite-cmd-loop/OTP-13160:
wx: Fix some function specifications
wx: Remove call to disconnect_impl from server
wx: Add a command queue check after event sent to erlang
wx: Make wxPostScriptDC optional
wx: Add wxOverlay
wx: Use only one ring buffer for command queue
Diffstat (limited to 'lib/wx/api_gen/gl_gen_erl.erl')
-rw-r--r-- | lib/wx/api_gen/gl_gen_erl.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl index 20406a8d05..84e9600bc0 100644 --- a/lib/wx/api_gen/gl_gen_erl.erl +++ b/lib/wx/api_gen/gl_gen_erl.erl @@ -226,10 +226,14 @@ gen_types(Where) -> w("-type clamp() :: float(). %% 0.0..1.0~n", []), w("-type offset() :: non_neg_integer(). %% Offset in memory block~n", []) end, - w("-type matrix() :: {float(),float(),float(),float(),~n", []), + w("-type matrix12() :: {float(),float(),float(),float(),~n", []), + w(" float(),float(),float(),float(),~n", []), + w(" float(),float(),float(),float()}.~n", []), + w("-type matrix16() :: {float(),float(),float(),float(),~n", []), w(" float(),float(),float(),float(),~n", []), w(" float(),float(),float(),float(),~n", []), w(" float(),float(),float(),float()}.~n", []), + w("-type matrix() :: matrix12() | matrix16().~n", []), w("-type mem() :: binary() | tuple(). %% Memory block~n", []), ok. @@ -480,10 +484,12 @@ doc_arg_type2(T=#type{single=true}) -> doc_arg_type3(T); doc_arg_type2(T=#type{single=undefined}) -> doc_arg_type3(T); -doc_arg_type2(T=#type{single={tuple,undefined}}) -> - "{" ++ doc_arg_type3(T) ++ "}"; +doc_arg_type2(_T=#type{single={tuple,undefined}}) -> + "tuple()"; doc_arg_type2(#type{base=float, single={tuple,16}}) -> "matrix()"; +doc_arg_type2(#type{base=string, single=list}) -> + "iolist()"; doc_arg_type2(T=#type{single={tuple,Sz}}) -> "{" ++ args(fun doc_arg_type3/1, ",", lists:duplicate(Sz,T)) ++ "}"; doc_arg_type2(T=#type{single=list}) -> |