Update zon version

LICENSE

@@ -1,675 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
-

README.md

@@ -8,7 +8,7 @@ The library exports the following primary components:
 
 * **`GpuDevice`**: Initializes the WebGPU instance, adapter, device, and queue. It is configured to prioritize high performance and automatically requests the `ShaderF16` feature if the adapter supports it. It provides the base `GpuAllocator` for raw VRAM allocations.
 * **`GpuArenaAllocator`**: A memory management layer that wraps a base allocator to track and automatically destroy all allocated WebGPU buffers, textures, views, and pipelines when deinitialized.
-* **`GpuBuffer`**: Wraps native WebGPU buffers. It provides a `.load()` method for CPU-to-GPU data transfers and a `.read()` method that utilizes a staging buffer to map GPU data back to the CPU.
+* **`GpuBuffer`**: Wraps native WebGPU buffers. It provides a `.load()` method for CPU-to-GPU data transfers and a `.read()` method to map GPU data back to the CPU.
 * **`GpuCompute`**: Compiles WGSL source code into a compute pipeline and dispatches compute workgroups.
 * **`GpuRender` / `GpuTexture` / `GpuTextureView`**: Components used to initialize render pipelines, set up render attachments (textures), and bind render targets for offscreen drawing.
 
@@ -36,11 +36,11 @@ pub fn main(init: std.process.Init) !void {
     // 2. Create a GPU Arena to manage VRAM
     var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
     defer grena.deinit();
-    const gloc = grena.gpuAllocator();
+    const glloc = grena.gpuAllocator();
 
     // 3. Load the WGSL compute pipeline
     const add_cp = try GpuCompute.init(
-        gloc,
+        glloc,
         @embedFile("shaders/add.wgsl"),
         .{
             .label = "add",
@@ -66,9 +66,9 @@ pub fn main(init: std.process.Init) !void {
 
     // 5. Initialize raw GPU Buffers
     const byte_size = len * @sizeOf(f16);
-    const buf_a = try GpuBuffer.init(gloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_a = try GpuBuffer.init(glloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
-    const buf_b = try GpuBuffer.init(gloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_b = try GpuBuffer.init(glloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
-    const buf_out = try GpuBuffer.init(gloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_out = try GpuBuffer.init(glloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
 
     // Note: Buffers are safely tied to the GpuArenaAllocator which will automatically
     // release them at the end. You can also manually call buf_x.deinit() if desired.
@@ -79,7 +79,7 @@ pub fn main(init: std.process.Init) !void {
     try buf_b.load(f16, data_b);
 
     // 7. Dispatch the Compute
-    try add_cp.run(gloc, .{ buf_a, buf_b, buf_out });
+    try add_cp.run(glloc, .{ buf_a, buf_b, buf_out });
 
     // 8. Map and copy the resulting buffer back to the CPU
     const out = try buf_out.read(allocator, f16);
@@ -119,18 +119,18 @@ pub fn main(init: std.process.Init) !void {
     // 2. Init VRAM Arena
     var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
     defer grena.deinit();
-    const gloc = grena.gpuAllocator();
+    const glloc = grena.gpuAllocator();
 
     // 3. Load Render Pipeline
     const circle_rp = try GpuRender.init(
-        gloc,
+        glloc,
         @embedFile("shaders/circle.wgsl"),
         .{ .bindings = &.{}, .texture_format = .RGBA8Unorm, .topology = .TriangleStrip },
     );
     defer circle_rp.deinit();
 
     // 4. Create VRAM texture to render into
-    const texture = try GpuTexture.init(gloc, .{
+    const texture = try GpuTexture.init(glloc, .{
         .format = .RGBA8Unorm,
         .size = .{ .width = width, .height = height, .depthOrArrayLayers = 1 },
         .usage = .initMany(&.{ .RenderAttachment, .CopySrc }),
@@ -138,14 +138,14 @@ pub fn main(init: std.process.Init) !void {
     defer texture.deinit();
 
     // 5. Create a view from texture
-    const view = try GpuTextureView.init(gloc, texture, .{});
+    const view = try GpuTextureView.init(glloc, texture, .{});
     defer view.deinit();
 
     // 6. Run the rendering pipeline
-    try circle_rp.draw(gloc, view, 4, .{});
+    try circle_rp.draw(glloc, view, 4, .{});
 
     // 7. Load Texture into GpuBuffer
-    const cpu_staging_cpu = try texture.buffCopy(gloc);
+    const cpu_staging_cpu = try texture.buffCopy(glloc);
     defer cpu_staging_cpu.deinit();
 
     // 8. Read GpuBuffer to CPU
@@ -200,10 +200,7 @@ zig build bench_cp
 
 ## System Requirements
 
-Because this library binds to native system graphics APIs via `wgpu-native`,
+Because this library binds to native system graphics APIs via `wgpu-native`, you must ensure the appropriate development headers and libraries are available on your system before compiling.
-you must ensure the appropriate development headers and libraries are available on your system before compiling.
-
-It work both for x86_64 and aarch64 on all platforms.
 
 ### Linux (Vulkan)
 
@@ -226,7 +223,7 @@ No extra installation required. Automatically links against `d3d12`, `dxgi`, and
 Add it to your `build.zig.zon`:
 
 ```bash
-zig fetch --save git+[https://git.bouvais.lu/adrien/zig-wgpu#ref=0.2.0](https://git.bouvais.lu/adrien/zig-wgpu)
+zig fetch --save git+https://git.bouvais.lu/adrien/zig-wgpu#ref=0.2.1
 ```
 
 Then, expose it in your `build.zig`:

build.zig

@@ -9,20 +9,12 @@ pub fn build(b: *std.Build) !void {
         .target = target,
     });
 
-    const t = target.result;
-    const arch_name = @tagName(t.cpu.arch);
-    const os_name = @tagName(t.os.tag);
-
-    // Windows uses .lib, Unix-like systems use .a
-    const lib_filename = if (t.os.tag == .windows) "wgpu_native.lib" else "libwgpu_native.a";
-
-    // Example: "libs/wgpu-native/x86_64-windows/wgpu_native.lib"
-    const wgpu_lib_path = b.fmt("libs/wgpu-native/{s}-{s}/{s}", .{ arch_name, os_name, lib_filename });
-
     mod.addIncludePath(b.path("libs/wgpu-native/include"));
-    mod.addObjectFile(b.path(wgpu_lib_path));
+    mod.addLibraryPath(b.path("libs/wgpu-native/lib"));
+    mod.addObjectFile(b.path("libs/wgpu-native/lib/libwgpu_native.a"));
 
     // Platform-specific system frameworks needed by wgpu-native
+    const t = target.result;
     if (t.os.tag == .macos) {
         mod.linkFramework("Metal", .{});
         mod.linkFramework("QuartzCore", .{});
@@ -32,7 +24,6 @@ pub fn build(b: *std.Build) !void {
         mod.linkSystemLibrary("d3d12", .{});
         mod.linkSystemLibrary("dxgi", .{});
         mod.linkSystemLibrary("user32", .{});
-        mod.link_libc = true;
     } else {
         mod.linkSystemLibrary("vulkan", .{});
         mod.linkSystemLibrary("gcc_s", .{});
@@ -60,11 +51,6 @@ pub fn build(b: *std.Build) !void {
             });
             exe.root_module.addImport("gpu", mod);
 
-            if (t.os.tag == .windows) {
-                exe.bundle_compiler_rt = false;
-                exe.bundle_ubsan_rt = false;
-            }
-
             b.installArtifact(exe);
 
             const run_step = b.step(entry.name[0 .. entry.name.len - 4], try std.fmt.bufPrint(&buf, "Run {s} demo", .{entry.name}));

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .zig_wgpu,
-    .version = "0.2.0",
+    .version = "0.2.3",
     .fingerprint = 0x5d0e853acbc0c2c6,
     .minimum_zig_version = "0.16.0",
     .dependencies = .{},

dl_wgpu_release.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# 1. SET THIS to the exact git tag of the release you are downloading
-# (e.g., "v22.1.0.5" or "v0.19.4.1")
-VERSION="v29.0.0.0" 
-BASE_URL="https://github.com/gfx-rs/wgpu-native/releases/download/$VERSION"
-
-# Move into the wgpu-native folder
-cd libs/wgpu-native || { echo "Could not find libs/wgpu-native"; exit 1; }
-
-# Map the zip filenames to your target directory structure
-declare -A TARGETS=(
-    ["wgpu-linux-x86_64-release.zip"]="x86_64-linux"
-    ["wgpu-linux-aarch64-release.zip"]="aarch64-linux"
-    ["wgpu-macos-x86_64-release.zip"]="x86_64-macos"
-    ["wgpu-macos-aarch64-release.zip"]="aarch64-macos"
-    ["wgpu-windows-x86_64-msvc-release.zip"]="x86_64-windows"
-    ["wgpu-windows-aarch64-msvc-release.zip"]="aarch64-windows"
-)
-
-for ZIP in "${!TARGETS[@]}"; do
-    DIR="${TARGETS[$ZIP]}"
-    echo "Processing $DIR..."
-    
-    # Create the target directory
-    mkdir -p "$DIR"
-    
-    # Download the zip file
-    if wget -q --show-progress "$BASE_URL/$ZIP" -O "$ZIP"; then
-        # Extract directly into the target directory
-        unzip -q -o "$ZIP" -d "$DIR"
-        echo "Successfully extracted to $DIR/"
-    else
-        echo "Failed to download $ZIP. Check your VERSION tag."
-    fi
-    
-    # Remove the downloaded zip to keep things clean
-    rm -f "$ZIP"
-done
-
-echo "Done! Your directories are set up."

examples/bench_cp.zig

@@ -13,10 +13,10 @@ const Vec = struct {
     buf: GpuBuffer,
     len: usize,
 
-    // Changed: gloc is passed by value (const)
+    // Changed: glloc is passed by value (const)
-    pub fn initZero(gloc: GpuAllocator, len: usize) !Vec {
+    pub fn initZero(glloc: GpuAllocator, len: usize) !Vec {
         return .{
-            .buf = try GpuBuffer.init(gloc, .{
+            .buf = try GpuBuffer.init(glloc, .{
                 .size = len * @sizeOf(f16),
                 .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }),
             }),
@@ -24,9 +24,9 @@ const Vec = struct {
         };
     }
 
-    // Changed: gloc is passed by value
+    // Changed: glloc is passed by value
-    pub fn initLoad(gloc: GpuAllocator, data: []const f16) !Vec {
+    pub fn initLoad(glloc: GpuAllocator, data: []const f16) !Vec {
-        var self = try initZero(gloc, data.len);
+        var self = try initZero(glloc, data.len);
         try self.load(data); // Direct access via the interface copy
         return self;
     }
@@ -40,18 +40,18 @@ const Vec = struct {
         try self.buf.load(f16, data);
     }
 
-    // Changed: gloc is passed by value instead of *GpuAllocator
+    // Changed: glloc is passed by value instead of *GpuAllocator
-    pub fn run(self: Vec, gloc: GpuAllocator, other: Vec, process: GpuCompute) !Vec {
+    pub fn run(self: Vec, glloc: GpuAllocator, other: Vec, process: GpuCompute) !Vec {
         std.debug.assert(self.len == other.len);
 
-        const result = try Vec.initZero(gloc, self.len);
+        const result = try Vec.initZero(glloc, self.len);
         errdefer result.deinit();
 
-        try process.run(gloc, .{ self.buf, other.buf, result.buf });
+        try process.run(glloc, .{ self.buf, other.buf, result.buf });
         return result;
     }
 
-    // Changed: gloc is passed by value instead of *GpuAllocator
+    // Changed: glloc is passed by value instead of *GpuAllocator
     pub fn read(self: Vec, alloc: std.mem.Allocator) ![]f16 {
         return self.buf.read(alloc, f16);
     }
@@ -63,9 +63,9 @@ pub fn main(init: std.process.Init) !void {
 
     var grena = GpuArenaAllocator.init(init.gpa, device.gpuAllocator());
     defer grena.deinit();
-    const gloc = grena.gpuAllocator();
+    const glloc = grena.gpuAllocator();
 
-    const add_pip = try GpuCompute.init(gloc, @embedFile("shaders/add.wgsl"), .{ .bindings = &.{
+    const add_pip = try GpuCompute.init(glloc, @embedFile("shaders/add.wgsl"), .{ .bindings = &.{
         .{ .element_size = @sizeOf(f16) },
         .{ .element_size = @sizeOf(f16) },
         .{ .element_size = @sizeOf(f16) },
@@ -120,9 +120,9 @@ pub fn main(init: std.process.Init) !void {
             // --- 1. GPU ALLOCATION PHASE ---
             const alloc_start = std.Io.Clock.awake.now(init.io);
 
-            const a = try Vec.initLoad(gloc, data_a);
+            const a = try Vec.initLoad(glloc, data_a);
             defer a.deinit();
-            const b = try Vec.initLoad(gloc, data_b);
+            const b = try Vec.initLoad(glloc, data_b);
             defer b.deinit();
 
             const alloc_duration = alloc_start.durationTo(std.Io.Clock.awake.now(init.io));
@@ -132,7 +132,7 @@ pub fn main(init: std.process.Init) !void {
             // --- 2. COMPUTE PHASE ---
             const compute_start = std.Io.Clock.awake.now(init.io);
 
-            const sum = try a.run(gloc, b, add_pip);
+            const sum = try a.run(glloc, b, add_pip);
             defer sum.deinit();
 
             // All 3 buffers (a, b, sum) are currently resident in VRAM here.

examples/circle.zig

@@ -20,18 +20,18 @@ pub fn main(init: std.process.Init) !void {
     // 2. Init VRAM Arena
     var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
     defer grena.deinit();
-    const gloc = grena.gpuAllocator();
+    const glloc = grena.gpuAllocator();
 
     // 3. Load Render Pipeline
     const circle_rp = try GpuRender.init(
-        gloc,
+        glloc,
         @embedFile("shaders/circle.wgsl"),
         .{ .bindings = &.{}, .texture_format = .RGBA8Unorm, .topology = .TriangleStrip },
     );
     defer circle_rp.deinit();
 
     // 4. Create VRAM texture to render into
-    const texture = try GpuTexture.init(gloc, .{
+    const texture = try GpuTexture.init(glloc, .{
         .format = .RGBA8Unorm,
         .size = .{ .width = width, .height = height, .depthOrArrayLayers = 1 },
         .usage = .initMany(&.{ .RenderAttachment, .CopySrc }),
@@ -39,14 +39,14 @@ pub fn main(init: std.process.Init) !void {
     defer texture.deinit();
 
     // 5. Create a view from texture
-    const view = try GpuTextureView.init(gloc, texture, .{});
+    const view = try GpuTextureView.init(glloc, texture, .{});
     defer view.deinit();
 
     // 6. Run the rendering pipeline
-    try circle_rp.draw(gloc, view, 4, .{});
+    try circle_rp.draw(glloc, view, 4, .{});
 
     // 7. Load Texture into GpuBuffer
-    const cpu_staging_cpu = try texture.buffCopy(gloc);
+    const cpu_staging_cpu = try texture.buffCopy(glloc);
     defer cpu_staging_cpu.deinit();
 
     // 8. Read GpuBuffer to CPU

examples/compute.zig

@@ -15,11 +15,11 @@ pub fn main(init: std.process.Init) !void {
     // 2. Create a GPU Arena to manage VRAM
     var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
     defer grena.deinit();
-    const gloc = grena.gpuAllocator();
+    const glloc = grena.gpuAllocator();
 
     // 3. Load the WGSL compute pipeline
     const add_cp = try GpuCompute.init(
-        gloc,
+        glloc,
         @embedFile("shaders/add.wgsl"),
         .{
             .label = "add",
@@ -32,7 +32,7 @@ pub fn main(init: std.process.Init) !void {
     );
 
     // 4. Setup CPU data
-    const len: usize = 1024;
+    const len: usize = 16;
     const data_a = try allocator.alloc(f16, len);
     defer allocator.free(data_a);
     const data_b = try allocator.alloc(f16, len);
@@ -45,9 +45,9 @@ pub fn main(init: std.process.Init) !void {
 
     // 5. Initialize raw GPU Buffers
     const byte_size = len * @sizeOf(f16);
-    const buf_a = try GpuBuffer.init(gloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_a = try GpuBuffer.init(glloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
-    const buf_b = try GpuBuffer.init(gloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_b = try GpuBuffer.init(glloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
-    const buf_out = try GpuBuffer.init(gloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
+    const buf_out = try GpuBuffer.init(glloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
 
     // Note: Buffers are safely tied to the GpuArenaAllocator which will automatically
     // release them at the end. You can also manually call buf_x.deinit() if desired.
@@ -58,18 +58,11 @@ pub fn main(init: std.process.Init) !void {
     try buf_b.load(f16, data_b);
 
     // 7. Dispatch the Compute
-    try add_cp.run(gloc, .{ buf_a, buf_b, buf_out });
+    try add_cp.run(glloc, .{ buf_a, buf_b, buf_out });
 
     // 8. Map and copy the resulting buffer back to the CPU
-    const staging = try GpuBuffer.init(gloc, .{
+    const out = try buf_out.read(allocator, f16);
-        .size = byte_size,
-        .usage = .initMany(&.{ .MapRead, .CopyDst }),
-    });
-    defer staging.deinit();
-
-    try buf_out.copy(staging);
-    const out = try staging.read(allocator, f16);
     defer allocator.free(out);
 
-    std.debug.print("Result: {any}\n", .{out[0..@min(6, len)]});
+    std.debug.print("Result: {any}\n", .{out});
 }

src/GpuArenaAllocator.zig

@@ -87,14 +87,6 @@ pub fn gpuAllocator(self: *@This()) GpuAllocator {
 fn allocBuffer(ctx: *anyopaque, desc: c.WGPUBufferDescriptor) anyerror!c.WGPUBuffer {
     const self: *@This() = @ptrCast(@alignCast(ctx));
     try self.tracked_buffers.ensureTotalCapacity(self.tracked_buffers.count() + 1);
-
-    const bytes = desc.size;
-    if (bytes > self.child_allocator.device.limits.maxBufferSize)
-        return error.SingleBufferExceedsLimit;
-
-    if (bytes + self.allocated_vram_bytes > self.child_allocator.device.def.vram_bytes_limit)
-        return error.ExceedsVramBudget;
-
     const raw = try self.child_allocator.allocBuffer(desc);
     self.tracked_buffers.putAssumeCapacity(raw, desc);
     self.allocated_vram_bytes += desc.size;

src/GpuBuffer.zig

@@ -4,10 +4,11 @@ const GpuAllocator = @import("GpuAllocator.zig");
 const svOpt = @import("utils.zig").svOpt;
 
 raw: c.WGPUBuffer,
-gloc: GpuAllocator,
+size: u64,
-def: GpuBufferDef,
+usage: c.WGPUBufferUsage,
+glloc: GpuAllocator,
 
-pub const GpuBufferUsage = enum(u64) {
+const BufferUsage = enum(u64) {
     None = 0x0000000000000000,
     MapRead = 0x0000000000000001,
     MapWrite = 0x0000000000000002,
@@ -19,40 +20,37 @@ pub const GpuBufferUsage = enum(u64) {
     Storage = 0x0000000000000080,
     Indirect = 0x0000000000000100,
     QueryResolve = 0x0000000000000200,
-
-    fn enumSetToWGPUBufferUsage(set: std.EnumSet(GpuBufferUsage)) c.WGPUBufferUsage {
-        var use: u64 = 0;
-        var iter = set.iterator();
-        while (iter.next()) |flag| use |= @intFromEnum(flag);
-        return use;
-    }
 };
 
-pub const GpuBufferDef = struct {
+const GpuBufferDef = struct {
     label: ?[]const u8 = null,
     size: u64,
-    usage: std.EnumSet(GpuBufferUsage),
+    usage: std.EnumSet(BufferUsage),
 };
 
-pub fn init(gloc: GpuAllocator, def: GpuBufferDef) !@This() {
+pub fn init(glloc: GpuAllocator, def: GpuBufferDef) !@This() {
+    var use: u64 = 0;
+    var iter = def.usage.iterator();
+    while (iter.next()) |flag| use |= @intFromEnum(flag);
 
     // Automatically align the buffer size forward to a multiple of 4 bytes under the hood
     const aligned_size = std.mem.alignForward(u64, def.size, 4);
 
-    const raw_handle = try gloc.allocBuffer(.{
+    const raw_handle = try glloc.allocBuffer(.{
         .size = aligned_size,
-        .usage = GpuBufferUsage.enumSetToWGPUBufferUsage(def.usage),
+        .usage = use,
         .label = svOpt(def.label),
     });
     return .{
         .raw = raw_handle,
-        .def = def,
+        .size = aligned_size,
-        .gloc = gloc,
+        .usage = use,
+        .glloc = glloc,
     };
 }
 
 pub fn deinit(self: @This()) void {
-    self.gloc.freeBuffer(self.raw);
+    self.glloc.freeBuffer(self.raw);
 }
 
 pub fn getConstMappedRange(self: @This(), offset: u64, size: u64) ?*const anyopaque {
@@ -81,46 +79,57 @@ pub fn load(
 ) !void {
     const bytes = data.len * @sizeOf(T);
 
-    if (bytes == self.def.size) {
+    if (bytes == self.size) {
         // Aligned path: direct download
-        c.wgpuQueueWriteBuffer(self.gloc.device.queue, self.raw, 0, data.ptr, self.def.size);
+        c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, 0, data.ptr, self.size);
     } else {
         // Unaligned path: Split the write into an aligned chunk and a padded remainder
         // to support arbitrary lengths without any allocations or large stack arrays.
         const aligned_part = (bytes / 4) * 4;
         if (aligned_part > 0) {
-            c.wgpuQueueWriteBuffer(self.gloc.device.queue, self.raw, 0, data.ptr, aligned_part);
+            c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, 0, data.ptr, aligned_part);
         }
 
         var remainder_buf: [4]u8 = .{ 0, 0, 0, 0 };
         const data_bytes = std.mem.sliceAsBytes(data);
         @memcpy(remainder_buf[0 .. bytes - aligned_part], data_bytes[aligned_part..bytes]);
 
-        c.wgpuQueueWriteBuffer(self.gloc.device.queue, self.raw, aligned_part, &remainder_buf, 4);
+        c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, aligned_part, &remainder_buf, 4);
     }
 }
 
 /// GPU to CPU
-/// Buffer must have MapRead usage or returns error.BufferNotMappable.
 pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
-    if (!self.def.usage.contains(.MapRead)) return error.BufferNotMappable;
+    const out = try alloc.alloc(T, @divExact(self.size, @sizeOf(T)));
 
-    const out = try alloc.alloc(T, @divExact(self.def.size, @sizeOf(T)));
+    const staging = try init(self.glloc, .{
+        .size = self.size,
+        .usage = .initMany(&.{ .MapRead, .CopyDst }),
+        .label = "staging_read_buffer",
+    });
+    defer staging.deinit();
+
+    const enc = c.wgpuDeviceCreateCommandEncoder(self.glloc.device.device, null) orelse return error.Encoder;
+    c.wgpuCommandEncoderCopyBufferToBuffer(enc, self.raw, 0, staging.raw, 0, self.size);
+    const cmd = c.wgpuCommandEncoderFinish(enc, null);
+    defer c.wgpuCommandEncoderRelease(enc);
+    defer c.wgpuCommandBufferRelease(cmd);
+    c.wgpuQueueSubmit(self.glloc.device.queue, 1, &cmd);
 
     var mapped = false;
-    self.mapAsync(
+    staging.mapAsync(
         c.WGPUMapMode_Read,
         0,
-        self.def.size,
+        self.size,
         .{ .callback = onMapped, .userdata1 = &mapped },
     );
-    while (!mapped) self.gloc.device.poll();
+    while (!mapped) self.glloc.device.poll();
 
     const ptr: [*]const T = @ptrCast(@alignCast(
-        self.getConstMappedRange(0, self.def.size),
+        staging.getConstMappedRange(0, self.size),
     ));
     @memcpy(out[0..out.len], ptr[0..out.len]);
-    self.unmap();
+    staging.unmap();
 
     return out;
 }
@@ -134,20 +143,3 @@ fn onMapped(
     const flag: *bool = @ptrCast(@alignCast(userdata1.?));
     flag.* = (status == c.WGPUMapAsyncStatus_Success);
 }
-
-/// GPU to GPU. Both buffers must be same size, src needs CopySrc, dst needs CopyDst.
-pub fn copy(src: @This(), dst: @This()) !void {
-    if (src.def.size != dst.def.size) return error.SizeMismatch;
-
-    const copy_src: u64 = @intFromEnum(GpuBufferUsage.CopySrc);
-    const copy_dst: u64 = @intFromEnum(GpuBufferUsage.CopyDst);
-    if (@as(u64, GpuBufferUsage.enumSetToWGPUBufferUsage(src.def.usage)) & copy_src == 0) return error.SrcNotCopyable;
-    if (@as(u64, GpuBufferUsage.enumSetToWGPUBufferUsage(dst.def.usage)) & copy_dst == 0) return error.DstNotWritable;
-
-    const enc = c.wgpuDeviceCreateCommandEncoder(src.gloc.device.device, null) orelse return error.Encoder;
-    c.wgpuCommandEncoderCopyBufferToBuffer(enc, src.raw, 0, dst.raw, 0, src.def.size);
-    const cmd = c.wgpuCommandEncoderFinish(enc, null);
-    defer c.wgpuCommandEncoderRelease(enc);
-    defer c.wgpuCommandBufferRelease(cmd);
-    c.wgpuQueueSubmit(src.gloc.device.queue, 1, &cmd);
-}

src/GpuCompute.zig

@@ -22,40 +22,40 @@ pub const ComputeDef = struct {
 };
 
 pip: c.WGPUComputePipeline,
-gloc: GpuAllocator,
+glloc: GpuAllocator,
 def: ComputeDef,
 
-pub fn init(gloc: GpuAllocator, wgsl: []const u8, def: ComputeDef) !@This() {
+pub fn init(glloc: GpuAllocator, wgsl: []const u8, def: ComputeDef) !@This() {
     var wgsl_src = c.WGPUShaderSourceWGSL{
         .chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
         .code = sv(wgsl),
     };
-    const shader = c.wgpuDeviceCreateShaderModule(gloc.device.device, &.{
+    const shader = c.wgpuDeviceCreateShaderModule(glloc.device.device, &.{
         .nextInChain = @ptrCast(&wgsl_src),
     }) orelse return error.Shader;
     defer c.wgpuShaderModuleRelease(shader);
 
-    const pip = try gloc.allocComputePipeline(.{
+    const pip = try glloc.allocComputePipeline(.{
         .label = svOpt(def.label),
         .compute = .{ .module = shader, .entryPoint = sv("main") },
     });
 
     return .{
-        .gloc = gloc,
+        .glloc = glloc,
         .pip = pip,
         .def = def,
     };
 }
 
 pub fn deinit(self: @This()) void {
-    self.gloc.freeComputePipeline(self.pip);
+    self.glloc.freeComputePipeline(self.pip);
 }
 
 /// Execute the compute pass with arbitrary buffer bindings via a tuple.
-/// Example: `try proc.run(gloc, .{ buf_a, buf_b, buf_out });`
+/// Example: `try proc.run(glloc, .{ buf_a, buf_b, buf_out });`
 pub fn run(
     self: @This(),
-    gloc: GpuAllocator,
+    glloc: GpuAllocator,
     args: anytype,
 ) !void {
     const type_info = @typeInfo(@TypeOf(args));
@@ -74,7 +74,7 @@ pub fn run(
             const buf = @field(args, field.name);
             const el_size = self.def.bindings[i].element_size;
             if (el_size > 0) {
-                elements_count = @intCast(buf.def.size / el_size);
+                elements_count = @intCast(buf.size / el_size);
             }
         }
     }
@@ -85,7 +85,7 @@ pub fn run(
         const el_size = self.def.bindings[i].element_size;
         if (el_size > 0) {
             const expected_min_bytes = @as(u64, elements_count) * el_size;
-            if (buf.def.size < expected_min_bytes)
+            if (buf.size < expected_min_bytes)
                 return error.BufferTooSmall;
         }
     }
@@ -103,7 +103,7 @@ pub fn run(
             .binding = @intCast(i),
             .buffer = buf.raw,
             .offset = 0,
-            .size = buf.def.size, // Size exposes the fully allocated length
+            .size = buf.size, // Size exposes the fully allocated length
         };
         entry_count += 1;
     }
@@ -113,12 +113,12 @@ pub fn run(
     defer if (info_buf) |b| b.deinit();
 
     if (self.def.append_info_buffer) {
-        info_buf = try GpuBuffer.init(gloc, .{
+        info_buf = try GpuBuffer.init(glloc, .{
             .size = @sizeOf(u32),
             .usage = .initMany(&.{ .Uniform, .CopyDst }),
             .label = "compute_info_buffer",
         });
-        c.wgpuQueueWriteBuffer(gloc.device.queue, info_buf.?.raw, 0, &elements_count, @sizeOf(u32));
+        c.wgpuQueueWriteBuffer(glloc.device.queue, info_buf.?.raw, 0, &elements_count, @sizeOf(u32));
 
         entries_buf[entry_count] = .{
             .binding = @intCast(entry_count),
@@ -130,11 +130,11 @@ pub fn run(
     }
 
     const entries = entries_buf[0..entry_count];
-    try submitPass(gloc, self.pip, entries, elements_count, self.def.workgroup_size, self.def.max_workgroups);
+    try submitPass(glloc, self.pip, entries, elements_count, self.def.workgroup_size, self.def.max_workgroups);
 }
 
 fn submitPass(
-    gloc: GpuAllocator,
+    glloc: GpuAllocator,
     pipeline: c.WGPUComputePipeline,
     entries: []const c.WGPUBindGroupEntry,
     n: usize,
@@ -146,14 +146,14 @@ fn submitPass(
     const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
     defer c.wgpuBindGroupLayoutRelease(bgl);
 
-    const bg = c.wgpuDeviceCreateBindGroup(gloc.device.device, &.{
+    const bg = c.wgpuDeviceCreateBindGroup(glloc.device.device, &.{
         .layout = bgl,
         .entries = entries.ptr,
         .entryCount = entries.len,
     }) orelse return error.BindGroup;
     defer c.wgpuBindGroupRelease(bg);
 
-    const enc = c.wgpuDeviceCreateCommandEncoder(gloc.device.device, null) orelse return error.Encoder;
+    const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
     const pass = c.wgpuCommandEncoderBeginComputePass(enc, null);
     c.wgpuComputePassEncoderSetPipeline(pass, pipeline);
     c.wgpuComputePassEncoderSetBindGroup(pass, 0, bg, 0, null);
@@ -168,7 +168,7 @@ fn submitPass(
     const cmd = c.wgpuCommandEncoderFinish(enc, null);
     defer c.wgpuCommandEncoderRelease(enc);
     defer c.wgpuCommandBufferRelease(cmd);
-    c.wgpuQueueSubmit(gloc.device.queue, 1, &cmd);
+    c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
 }
 
 fn ceilDiv(n: usize, d: usize) usize {

src/GpuRender.zig

@@ -34,16 +34,16 @@ const GpuPrimitiveTopology = enum(c_uint) {
     Force32 = 0x7FFFFFFF,
 };
 
-gloc: GpuAllocator,
+glloc: GpuAllocator,
 pip: c.WGPURenderPipeline,
 def: GpuRenderDef,
 
-pub fn init(gloc: GpuAllocator, wgsl: []const u8, def: GpuRenderDef) !@This() {
+pub fn init(glloc: GpuAllocator, wgsl: []const u8, def: GpuRenderDef) !@This() {
     var wgsl_src = c.WGPUShaderSourceWGSL{
         .chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
         .code = sv(wgsl),
     };
-    const shader = c.wgpuDeviceCreateShaderModule(gloc.device.device, &.{
+    const shader = c.wgpuDeviceCreateShaderModule(glloc.device.device, &.{
         .nextInChain = @ptrCast(&wgsl_src),
     }) orelse return error.Shader;
     defer c.wgpuShaderModuleRelease(shader);
@@ -69,7 +69,7 @@ pub fn init(gloc: GpuAllocator, wgsl: []const u8, def: GpuRenderDef) !@This() {
     };
 
     // 3. Compile the Complete Render Pipeline
-    const pip = try gloc.allocRenderPipeline(.{
+    const pip = try glloc.allocRenderPipeline(.{
         .label = svOpt(def.label),
         .vertex = .{
             .module = shader,
@@ -90,21 +90,21 @@ pub fn init(gloc: GpuAllocator, wgsl: []const u8, def: GpuRenderDef) !@This() {
     });
 
     return .{
-        .gloc = gloc,
+        .glloc = glloc,
         .pip = pip,
         .def = def,
     };
 }
 
 pub fn deinit(self: @This()) void {
-    self.gloc.freeRenderPipeline(self.pip);
+    self.glloc.freeRenderPipeline(self.pip);
 }
 
 /// Execute the render pass targeting a specific frame texture view.
 /// Passes bind groups via a tuple exactly like your original compute setup.
 pub fn draw(
     self: @This(),
-    gloc: GpuAllocator,
+    glloc: GpuAllocator,
     target_view: GpuTextureView,
     vertex_count: u32,
     args: anytype,
@@ -138,7 +138,7 @@ pub fn draw(
     const bgl = c.wgpuRenderPipelineGetBindGroupLayout(self.pip, 0);
     defer c.wgpuBindGroupLayoutRelease(bgl);
 
-    const bg = c.wgpuDeviceCreateBindGroup(gloc.device.device, &.{
+    const bg = c.wgpuDeviceCreateBindGroup(glloc.device.device, &.{
         .layout = bgl,
         .entries = entries.ptr,
         .entryCount = @intCast(entries.len),
@@ -146,7 +146,7 @@ pub fn draw(
     defer c.wgpuBindGroupRelease(bg);
 
     // Encode Render Command
-    const enc = c.wgpuDeviceCreateCommandEncoder(gloc.device.device, null) orelse return error.Encoder;
+    const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
     defer c.wgpuCommandEncoderRelease(enc);
 
     const color_attachment = c.WGPURenderPassColorAttachment{
@@ -180,5 +180,5 @@ pub fn draw(
     const cmd = c.wgpuCommandEncoderFinish(enc, null);
     defer c.wgpuCommandBufferRelease(cmd);
 
-    c.wgpuQueueSubmit(gloc.device.queue, 1, &cmd);
+    c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
 }

src/GpuTexture.zig

@@ -14,10 +14,10 @@ pub const GpuTextureDef = struct {
 };
 
 raw: c.WGPUTexture,
-gloc: GpuAllocator,
+glloc: GpuAllocator,
 def: GpuTextureDef,
 
-pub fn init(gloc: GpuAllocator, def: GpuTextureDef) !@This() {
+pub fn init(glloc: GpuAllocator, def: GpuTextureDef) !@This() {
     var use: u64 = 0;
     var iter = def.usage.iterator();
     while (iter.next()) |flag| use |= @intFromEnum(flag);
@@ -31,13 +31,13 @@ pub fn init(gloc: GpuAllocator, def: GpuTextureDef) !@This() {
         .mipLevelCount = 1,
         .sampleCount = 1,
     };
-    const raw = try gloc.allocTexture(desc);
+    const raw = try glloc.allocTexture(desc);
 
-    return .{ .gloc = gloc, .raw = raw, .def = def };
+    return .{ .glloc = glloc, .raw = raw, .def = def };
 }
 
 pub fn deinit(self: @This()) void {
-    self.gloc.freeTexture(self.raw);
+    self.glloc.freeTexture(self.raw);
 }
 
 pub fn getConstMappedRange(self: @This(), offset: u64, size: u64) ?*const anyopaque {
@@ -53,14 +53,14 @@ pub fn bytesSizeRow(self: @This()) u32 {
 }
 
 /// Return a GpuBuffer containing a copy of the texture.
-pub fn buffCopy(self: @This(), gloc: GpuAllocator) !GpuBuffer {
+pub fn buffCopy(self: @This(), glloc: GpuAllocator) !GpuBuffer {
-    const buf = try GpuBuffer.init(gloc, .{
+    const buf = try GpuBuffer.init(glloc, .{
         .size = self.bytesSize(),
         .usage = .initMany(&.{ .CopyDst, .CopySrc }),
         .label = "texture_copy_buffer",
     });
 
-    const enc = c.wgpuDeviceCreateCommandEncoder(gloc.device.device, null) orelse return error.Encoder;
+    const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
     defer c.wgpuCommandEncoderRelease(enc);
 
     const src_copy = c.WGPUTexelCopyTextureInfo{
@@ -82,7 +82,7 @@ pub fn buffCopy(self: @This(), gloc: GpuAllocator) !GpuBuffer {
 
     const cmd = c.wgpuCommandEncoderFinish(enc, null);
     defer c.wgpuCommandBufferRelease(cmd);
-    c.wgpuQueueSubmit(gloc.device.queue, 1, &cmd);
+    c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
 
     return buf;
 }
@@ -110,7 +110,7 @@ pub fn load(
     const bytes = data.len * @sizeOf(T);
 
     c.wgpuQueueWriteTexture(
-        self.gloc.device.queue,
+        self.glloc.device.queue,
         &.{
             .texture = self.raw,
             .mipLevel = 0,
@@ -132,14 +132,14 @@ pub fn load(
 pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
     const out = try alloc.alloc(T, @divExact(self.size, @sizeOf(T)));
 
-    const staging = try init(self.gloc, .{
+    const staging = try init(self.glloc, .{
         .size = self.size,
         .usage = .initMany(&.{ .MapRead, .CopyDst }),
         .label = "texture_read_staging",
     });
     defer staging.deinit();
 
-    const enc = c.wgpuDeviceCreateCommandEncoder(self.gloc.device.device, null) orelse return error.Encoder;
+    const enc = c.wgpuDeviceCreateCommandEncoder(self.glloc.device.device, null) orelse return error.Encoder;
     const src_copy = c.WGPUTexelCopyTextureInfo{
         .texture = self.raw,
         .mipLevel = 0,
@@ -158,7 +158,7 @@ pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
     const cmd = c.wgpuCommandEncoderFinish(enc, null);
     defer c.wgpuCommandEncoderRelease(enc);
     defer c.wgpuCommandBufferRelease(cmd);
-    c.wgpuQueueSubmit(self.gloc.device.queue, 1, &cmd);
+    c.wgpuQueueSubmit(self.glloc.device.queue, 1, &cmd);
 
     var mapped = false;
     staging.mapAsync(
@@ -167,7 +167,7 @@ pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
         self.size,
         .{ .callback = onMapped, .userdata1 = &mapped },
     );
-    while (!mapped) self.gloc.device.poll();
+    while (!mapped) self.glloc.device.poll();
 
     const ptr: [*]const T = @ptrCast(@alignCast(
         staging.getConstMappedRange(0, self.size),

src/GpuTextureView.zig

@@ -13,23 +13,23 @@ pub const GpuViewDef = struct {
 };
 
 raw: c.WGPUTextureView,
-gloc: GpuAllocator,
+glloc: GpuAllocator,
 
-pub fn init(gloc: GpuAllocator, texture: GpuTexture, def: GpuViewDef) !@This() {
+pub fn init(glloc: GpuAllocator, texture: GpuTexture, def: GpuViewDef) !@This() {
     var use: u64 = 0;
     var iter = def.usage.iterator();
     while (iter.next()) |flag| use |= @intFromEnum(flag);
 
-    const raw = try gloc.allocTextureView(texture.raw, .{
+    const raw = try glloc.allocTextureView(texture.raw, .{
         .label = svOpt(def.label),
         .format = @intFromEnum(def.format),
         .usage = use,
         .mipLevelCount = 1,
         .arrayLayerCount = 1,
     });
-    return .{ .gloc = gloc, .raw = raw };
+    return .{ .glloc = glloc, .raw = raw };
 }
 
 pub fn deinit(self: @This()) void {
-    self.gloc.freeTextureView(self.raw);
+    self.glloc.freeTextureView(self.raw);
 }