diff options
| author | Dan Gudmundsson <[email protected]> | 2016-11-28 10:28:06 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-11-28 10:28:06 +0100 |
| commit | 544f9eb04929c7c61fbe97ecd651ac24288d0d12 (patch) | |
| tree | ef0363e3d95b615c8398080a2592467d2b4a61ff /lib/wx/api_gen/glapi.conf | |
| parent | f8aef2dcae7162b59efb9513442c9643c9f5159e (diff) | |
| parent | 3c5f019a3a69d4d18c40dccaa91f522f85c9c92a (diff) | |
| download | otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.tar.gz otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.tar.bz2 otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.zip | |
Merge branch 'dgud/wx/gl-bugs' into maint
* dgud/wx/gl-bugs:
wx: Do not dispatch commands after frequent events
Avoid unnecessary length calculations in gl
Add option to send prebuilt binaries to multiDrawArrays
Fix gl driver pointer error
Diffstat (limited to 'lib/wx/api_gen/glapi.conf')
| -rw-r--r-- | lib/wx/api_gen/glapi.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/api_gen/glapi.conf b/lib/wx/api_gen/glapi.conf index 59fa8f7727..57f30a3f7e 100644 --- a/lib/wx/api_gen/glapi.conf +++ b/lib/wx/api_gen/glapi.conf @@ -181,9 +181,9 @@ {"glLoadTransposeMatrix", {"m", {single,{tuple,matrix}}}}. {"glMultTransposeMatrix", {"m",{single,{tuple,matrix}}}}. -{"glMultiDrawArrays", [{"first", [in,{single,list}]}, - {"count", [in,{single,list}]}, - {"primcount", {c_only, {length,"first"}}}]}. +{"glMultiDrawArrays", [{"first", [in,{single,list}, list_binary]}, + {"count", [in,{single,list}, list_binary]}, + {"primcount", {c_only, {length,"count"}}}]}. {"glGenQueries", {"ids", {single,{list, "n", "n"}}}}. {"glGetQueryiv", {"params", {single, true}}}. |