diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index f8701f2eb..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,94 +0,0 @@ -name: Bug report -description: Report a bug in DuckStation -body: - -- type: markdown - attributes: - value: | - **Please read before creating a new bug report:** - 1. Make sure there is not already an issue for this bug by [searching in **both** open and closed issues](https://github.com/stenzek/duckstation/issues?q=is%3Aissue+sort%3Aupdated-desc+). - 2. All enhancements **must** be off. To quickly disable all enhancements with affecting your normal configuration, you can check **Disable All Enhancements** in Advanced Options. - 3. All advanced options **must** be at their default values. - 4. No cheats may be active. If you were using cheats, they should be disabled, and the game must be rebooted before reporting the bug. - 5. Do not share save state files. (Sharing memory card files is OK.) - 6. Verify your BIOS and game dumps, as we can not assist with issues resulting from bad dumps. - 7. If playing PAL region software, please check whether or not the game has LibCrypt protection. If it does, make sure you have a [correct SBI file](https://github.com/stenzek/duckstation#libcrypt-protection-and-sbi-files). - 8. Please post your bug report in English, as this is the only language spoken by the developers. The [Discord server](https://discord.gg/Buktv3t) has many helpful people if you need help translating. - 9. Issues about the libretro core will be deleted (you will be blocked from the repository if you create such an issue). That core is not DuckStation, it is a broken fork, and has nothing to do with us. - -- type: input - attributes: - label: Game details - description: | - Specify the game's serial code, full name and region (USA, Europe, Japan). - placeholder: SLUS-00404 Ace Combat 2 (USA) - validations: - required: true - -- type: textarea - attributes: - label: Description of the issue/bug - description: | - Describe what you are seeing and/or hearing during gameplay. What doesn't work, and how do you expect it to work instead? - You can include images or videos with drag and drop, and format code blocks or logs with ``` tags. - validations: - required: true - -- type: textarea - attributes: - label: Steps to reproduce - description: | - Try to provide as much detail as possible to reproduce the issue. - Having reproducible issues is a *prerequisite* for contributors to be able to solve them. - validations: - required: true - -- type: input - attributes: - label: Software and hardware information - description: | - For desktops and laptops, specify your OS version, CPU and graphics card information (model and driver version). - For mobile devices, specify your OS version and device model name. - placeholder: Windows 10, Intel Core i7-7500U, Intel HD Graphics 620 (27.20.100.9616) - validations: - required: true - -- type: input - attributes: - label: DuckStation version - description: | - Specify your DuckStation version and how you installed it (GitHub Releases, GitHub Actions, compiled from source, …). - validations: - required: true - -- type: dropdown - attributes: - label: DuckStation rendering backend - description: | - Specify the DuckStation rendering backend you were using when reporting this issue. - If you can reproduce this issue using more than one rendering backend, mention it in the **Description of the issue/bug** section above. - When reporting a graphics-related issue, please test all the rendering backends you can before submitting the issue. - options: - - Software - - Direct3D 11 - - Direct3D 12 - - OpenGL - - Vulkan - validations: - required: true - -- type: input - attributes: - label: DuckStation controller backend, drivers and wrappers - description: | - Which controller backend are you using in DuckStation's General Settings? - Have you installed any drivers or wrappers on your system, or do you have any programs like Steam open? - If so, specify which drivers/wrappers you are using. - validations: - required: true - -- type: textarea - attributes: - label: Additional context - description: | - Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index d062f301a..000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -blank_issues_enabled: false - -contact_links: - - name: Game compatibility list - url: https://docs.google.com/spreadsheets/d/1H66MxViRjjE5f8hOl5RQmF5woS1murio2dsLn14kEqo/edit - about: Please refer to the game compatibility list before opening an issue. - - - name: Discord server - - url: https://discord.gg/Buktv3t - - about: Please ask support questions on the Discord server, not here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index 9a8e89d6f..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Feature request -description: Request a feature to be added or improved in DuckStation -body: - -- type: markdown - attributes: - value: | - **Please read before creating a new feature request:** - 1. Make sure there is not already an issue for this feature request by [searching in **both** open and closed issues](https://github.com/stenzek/duckstation/issues?q=is%3Aissue+sort%3Aupdated-desc+). - 2. Please open **one issue per requested feature**. Do not cram several unrelated feature requests in a single issue, as this makes it harder for contributors to track what's being worked on. - 3. Please post your feature request in English, as this is the only language spoken by the developers. The [Discord server](https://discord.gg/Buktv3t) has many helpful people if you need help translating. - 4. Issues about the libretro core will be deleted (you will be blocked from the repository if you create such an issue). That core is not DuckStation, it is a broken fork, and has nothing to do with us. - -- type: textarea - attributes: - label: Problem statement - description: | - Is your feature request related to a problem? Please describe. - placeholder: Example - "I'm always frustrated when […]" - validations: - required: true - -- type: textarea - attributes: - label: Proposed solution - description: | - A clear and concise description of what you want to happen. - validations: - required: true - -- type: textarea - attributes: - label: Alternatives considered - description: | - Describe alternatives you've considered. - validations: - required: true - -- type: textarea - attributes: - label: Additional context - description: | - Add any other context about the problem or proposed feature here. diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 50fea617b..b35bf7c7e 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -346,7 +346,7 @@ jobs: - name: Install packages shell: bash run: | - brew install curl ninja + brew install ninja - name: Cache Dependencies id: cache-deps-mac diff --git a/LICENSE b/LICENSE index 94a9ed024..cfe676c54 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,403 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. +Attribution-NonCommercial-NoDerivatives 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 +International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-NoDerivatives 4.0 International Public +License ("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + c. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + d. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + e. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + f. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + g. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + h. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce and reproduce, but not Share, Adapted Material + for NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material, You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + For the avoidance of doubt, You do not have permission under + this Public License to Share Adapted Material. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only and provided You do not Share Adapted Material; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/README.md b/README.md index 1a6627fc2..37157ccaa 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,9 @@ Other features include: - SDL, XInput or DInput compatible game controller (e.g. XB360/XBOne/XBSeries). DualShock 3 users on Windows will need to install the official DualShock 3 drivers included as part of PlayStation Now. ## Downloading and running -Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push. Binaries or packages distributed through other sources may be out of date and are not supported by the developer, please speak to them for support, not us. +Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push. + +As per the terms of CC-BY-NC-ND, redistribution of **unmodified releases and code** is permitted. However, we would prefer if you linked to https://www.duckstation.org/ instead. Please note that pre-configured settings and packages are considered modifications. For x86 machines (most systems), you will need a CPU that supports the SSE4.1 instruction set. This includes all CPUs manufactured after 2007. If you want to use DuckStation with a CPU that is older, [v0.1-6995](https://github.com/stenzek/duckstation/releases/tag/v0.1-6995) is the last version that does not require SSE4.1. @@ -82,11 +84,7 @@ Once downloaded and extracted, you can launch the emulator with `duckstation-qt- ### Linux -The only supported version of DuckStation for Linux are the AppImage and Flatpak in the releases page. If you installed DuckStation from another source or distribution (e.g. EmuDeck), you should contact the packager for support, we have no control over it. - -The release on [Flathub](https://flathub.org/apps/org.duckstation.DuckStation) is official, and synchronized with the latest rolling/stable release on GitHub. - -You **should not** install DuckStation from unofficial repositories such as the AUR, they are **known to be broken**. +DuckStation is provided for x86_64 Linux in AppImage and Flatpak formats. The release on [Flathub](https://flathub.org/apps/org.duckstation.DuckStation) is official, and synchronized with the latest rolling/stable release on GitHub. #### AppImage diff --git a/data/LICENSE.txt b/data/LICENSE.txt index 94a9ed024..cfe676c54 100644 --- a/data/LICENSE.txt +++ b/data/LICENSE.txt @@ -1,674 +1,403 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. +Attribution-NonCommercial-NoDerivatives 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 +International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-NoDerivatives 4.0 International Public +License ("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + c. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + d. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + e. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + f. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + g. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + h. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce and reproduce, but not Share, Adapted Material + for NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material, You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + For the avoidance of doubt, You do not have permission under + this Public License to Share Adapted Material. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only and provided You do not Share Adapted Material; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/data/resources/thirdparty.html b/data/resources/thirdparty.html index a4d7288c4..4b564053f 100644 --- a/data/resources/thirdparty.html +++ b/data/resources/thirdparty.html @@ -5,18 +5,11 @@ DuckStation PS1 Emulator Copyright (C) 2019-2024 Connor McLaughlin <stenzek@gmail.com> -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 licensed under the terms of the Creative Commons
+Attribution-NonCommercial-NoDerivatives International License
+(BY-NC-ND 4.0, https://creativecommons.org/licenses/by-nc-nd/4.0/). -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 <http://www.gnu.org/licenses> +You can also view this license by opening the LICENSE.txt file included with the program. DuckStation contains code written by, and copyrighted by third parties.
diff --git a/dep/imgui/include/IconsEmoji.h b/dep/imgui/include/IconsEmoji.h index 0bae4bf46..81b164b96 100644 --- a/dep/imgui/include/IconsEmoji.h +++ b/dep/imgui/include/IconsEmoji.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/scripts/appimage/make-appimage.sh b/scripts/appimage/make-appimage.sh index 51ea6c03f..1c962bf21 100755 --- a/scripts/appimage/make-appimage.sh +++ b/scripts/appimage/make-appimage.sh @@ -1,29 +1,7 @@ #!/usr/bin/env bash -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# For more information, please refer to +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}") diff --git a/scripts/check_regression_tests.py b/scripts/check_regression_tests.py index 9c7061bbf..eaa32a992 100644 --- a/scripts/check_regression_tests.py +++ b/scripts/check_regression_tests.py @@ -1,3 +1,7 @@ +#!/usr/bin/env python3 +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + import argparse import glob import sys diff --git a/scripts/flatpak/modules/20-sdl2.yaml b/scripts/flatpak/modules/20-sdl2.yaml index ed95c7892..14d366ffe 100644 --- a/scripts/flatpak/modules/20-sdl2.yaml +++ b/scripts/flatpak/modules/20-sdl2.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: sdl2 buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/21-libbacktrace.yaml b/scripts/flatpak/modules/21-libbacktrace.yaml index 3003bbfed..bb4e12d80 100644 --- a/scripts/flatpak/modules/21-libbacktrace.yaml +++ b/scripts/flatpak/modules/21-libbacktrace.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: libbacktrace buildsystem: autotools no-autogen: true diff --git a/scripts/flatpak/modules/22-shaderc.yaml b/scripts/flatpak/modules/22-shaderc.yaml index a94237685..18ee0e9b5 100644 --- a/scripts/flatpak/modules/22-shaderc.yaml +++ b/scripts/flatpak/modules/22-shaderc.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: shaderc buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/23-spirv-cross.yaml b/scripts/flatpak/modules/23-spirv-cross.yaml index d5bb025dd..8f1b643e3 100644 --- a/scripts/flatpak/modules/23-spirv-cross.yaml +++ b/scripts/flatpak/modules/23-spirv-cross.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: spirv-cross buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/24-cpuinfo.yaml b/scripts/flatpak/modules/24-cpuinfo.yaml index 08fa8a142..4d91e7fa0 100644 --- a/scripts/flatpak/modules/24-cpuinfo.yaml +++ b/scripts/flatpak/modules/24-cpuinfo.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: cpuinfo buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/25-discord-rpc.yaml b/scripts/flatpak/modules/25-discord-rpc.yaml index 85ba54043..06d1dd88a 100644 --- a/scripts/flatpak/modules/25-discord-rpc.yaml +++ b/scripts/flatpak/modules/25-discord-rpc.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: discord-rpc buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/26-soundtouch.yaml b/scripts/flatpak/modules/26-soundtouch.yaml index e7503d203..626bef06b 100644 --- a/scripts/flatpak/modules/26-soundtouch.yaml +++ b/scripts/flatpak/modules/26-soundtouch.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: soundtouch buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/modules/27-lunasvg.yaml b/scripts/flatpak/modules/27-lunasvg.yaml index 1f8999b9f..ad5abcdda 100644 --- a/scripts/flatpak/modules/27-lunasvg.yaml +++ b/scripts/flatpak/modules/27-lunasvg.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + name: lunasvg buildsystem: cmake-ninja builddir: true diff --git a/scripts/flatpak/org.duckstation.DuckStation.yaml b/scripts/flatpak/org.duckstation.DuckStation.yaml index 986ff6476..7f4815bce 100644 --- a/scripts/flatpak/org.duckstation.DuckStation.yaml +++ b/scripts/flatpak/org.duckstation.DuckStation.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + app-id: "org.duckstation.DuckStation" runtime: "org.kde.Platform" runtime-version: "6.7" diff --git a/scripts/org.duckstation.DuckStation.metainfo.xml.in b/scripts/org.duckstation.DuckStation.metainfo.xml.in index 113daa92b..61e642e7b 100644 --- a/scripts/org.duckstation.DuckStation.metainfo.xml.in +++ b/scripts/org.duckstation.DuckStation.metainfo.xml.in @@ -3,7 +3,7 @@ org.duckstation.DuckStation org.duckstation.DuckStation.desktop CC0-1.0 - GPL-3.0 + CC-BY-NC-ND-4.0 DuckStation Stenzek PlayStation Emulator diff --git a/src/common-tests/bitutils_tests.cpp b/src/common-tests/bitutils_tests.cpp index 6fee8e2fc..536e1e557 100644 --- a/src/common-tests/bitutils_tests.cpp +++ b/src/common-tests/bitutils_tests.cpp @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/bitutils.h" + #include "gtest/gtest.h" + #include template diff --git a/src/common-tests/file_system_tests.cpp b/src/common-tests/file_system_tests.cpp index be65b2466..6cb8628f6 100644 --- a/src/common-tests/file_system_tests.cpp +++ b/src/common-tests/file_system_tests.cpp @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/file_system.h" + #include #ifdef _WIN32 diff --git a/src/common-tests/gsvector_yuvtorgb_test.cpp b/src/common-tests/gsvector_yuvtorgb_test.cpp index 3e6bc821f..3153b2822 100644 --- a/src/common-tests/gsvector_yuvtorgb_test.cpp +++ b/src/common-tests/gsvector_yuvtorgb_test.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/bitutils.h" #include "common/gsvector.h" diff --git a/src/common-tests/path_tests.cpp b/src/common-tests/path_tests.cpp index f8db7ef97..ffd527ff2 100644 --- a/src/common-tests/path_tests.cpp +++ b/src/common-tests/path_tests.cpp @@ -1,8 +1,9 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/path.h" #include "common/types.h" + #include TEST(Path, ToNativePath) diff --git a/src/common-tests/rectangle_tests.cpp b/src/common-tests/rectangle_tests.cpp index 185cd6167..803938684 100644 --- a/src/common-tests/rectangle_tests.cpp +++ b/src/common-tests/rectangle_tests.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/gsvector.h" + #include TEST(Rectangle, AdjacentRectanglesNotIntersecting) diff --git a/src/common-tests/string_tests.cpp b/src/common-tests/string_tests.cpp index 518d21c33..4f3da18d6 100644 --- a/src/common-tests/string_tests.cpp +++ b/src/common-tests/string_tests.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/string_util.h" + #include TEST(StringUtil, Ellipsise) diff --git a/src/common/align.h b/src/common/align.h index 9585f07d9..8f9055543 100644 --- a/src/common/align.h +++ b/src/common/align.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/assert.cpp b/src/common/assert.cpp index d69653ddf..9c39c8ba9 100644 --- a/src/common/assert.cpp +++ b/src/common/assert.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "assert.h" #include "crash_handler.h" diff --git a/src/common/assert.h b/src/common/assert.h index 3455dfc78..502f02686 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/binary_reader_writer.cpp b/src/common/binary_reader_writer.cpp index 9c357876e..fcf8c3238 100644 --- a/src/common/binary_reader_writer.cpp +++ b/src/common/binary_reader_writer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "binary_reader_writer.h" #include "assert.h" diff --git a/src/common/binary_reader_writer.h b/src/common/binary_reader_writer.h index a8ff2c153..7242765b2 100644 --- a/src/common/binary_reader_writer.h +++ b/src/common/binary_reader_writer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "types.h" diff --git a/src/common/bitfield.h b/src/common/bitfield.h index 972f10c57..36ebff6db 100644 --- a/src/common/bitfield.h +++ b/src/common/bitfield.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/common/bitutils.h b/src/common/bitutils.h index dd253412f..72743050f 100644 --- a/src/common/bitutils.h +++ b/src/common/bitutils.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/cocoa_tools.h b/src/common/cocoa_tools.h index d2b91504a..f98d254c4 100644 --- a/src/common/cocoa_tools.h +++ b/src/common/cocoa_tools.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include #include diff --git a/src/common/cocoa_tools.mm b/src/common/cocoa_tools.mm index ab0047e71..5c9a086c0 100644 --- a/src/common/cocoa_tools.mm +++ b/src/common/cocoa_tools.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cocoa_tools.h" #include "small_string.h" @@ -49,16 +49,12 @@ bool CocoaTools::MoveFile(const char *source, const char *destination, Error *er } -// From https://github.com/PCSX2/pcsx2/blob/8d27c324187140df0c5a42f3a501b5d76b1215f5/common/CocoaTools.mm - -@interface PCSX2KVOHelper : NSObject - +@interface CommonKVOHelper : NSObject - (void)addCallback:(void*)ctx run:(void(*)(void*))callback; - (void)removeCallback:(void*)ctx; - @end -@implementation PCSX2KVOHelper +@implementation CommonKVOHelper { std::vector> _callbacks; } @@ -84,14 +80,14 @@ bool CocoaTools::MoveFile(const char *source, const char *destination, Error *er @end -static PCSX2KVOHelper* s_themeChangeHandler; +static CommonKVOHelper* s_themeChangeHandler; void CocoaTools::AddThemeChangeHandler(void* ctx, void(handler)(void* ctx)) { assert([NSThread isMainThread]); if (!s_themeChangeHandler) { - s_themeChangeHandler = [[PCSX2KVOHelper alloc] init]; + s_themeChangeHandler = [[CommonKVOHelper alloc] init]; NSApplication* app = [NSApplication sharedApplication]; [app addObserver:s_themeChangeHandler forKeyPath:@"effectiveAppearance" diff --git a/src/common/crash_handler.cpp b/src/common/crash_handler.cpp index 1dbc98056..4e4407a8a 100644 --- a/src/common/crash_handler.cpp +++ b/src/common/crash_handler.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "crash_handler.h" #include "dynamic_library.h" diff --git a/src/common/crash_handler.h b/src/common/crash_handler.h index 3b632d69b..26e5e8b67 100644 --- a/src/common/crash_handler.h +++ b/src/common/crash_handler.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/dynamic_library.cpp b/src/common/dynamic_library.cpp index bc27b64f7..223b29639 100644 --- a/src/common/dynamic_library.cpp +++ b/src/common/dynamic_library.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/dynamic_library.h" #include "common/assert.h" diff --git a/src/common/dynamic_library.h b/src/common/dynamic_library.h index fbe434be5..4cc40adab 100644 --- a/src/common/dynamic_library.h +++ b/src/common/dynamic_library.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/easing.h b/src/common/easing.h index 4c4c2bee3..18b5ef71c 100644 --- a/src/common/easing.h +++ b/src/common/easing.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/common/error.cpp b/src/common/error.cpp index 4ab1fe343..004d290eb 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "error.h" #include "string_util.h" diff --git a/src/common/error.h b/src/common/error.h index 23c23511b..25fc9c60b 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/fastjmp.cpp b/src/common/fastjmp.cpp index 893039f02..5ffca2a42 100644 --- a/src/common/fastjmp.cpp +++ b/src/common/fastjmp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Win32 uses Fastjmp.asm, because MSVC doesn't support inline asm. #if !defined(_WIN32) || defined(_M_ARM64) diff --git a/src/common/fastjmp.h b/src/common/fastjmp.h index 91a603b2e..c7e84284e 100644 --- a/src/common/fastjmp.h +++ b/src/common/fastjmp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/fastjmp_arm.asm b/src/common/fastjmp_arm.asm index ee664611f..1121fe2e1 100644 --- a/src/common/fastjmp_arm.asm +++ b/src/common/fastjmp_arm.asm @@ -1,5 +1,5 @@ -; SPDX-FileCopyrightText: 2021 Connor McLaughlin -; SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +; SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +; SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "ksarm64.h" diff --git a/src/common/fastjmp_x86.asm b/src/common/fastjmp_x86.asm index cf681d486..b4248da12 100644 --- a/src/common/fastjmp_x86.asm +++ b/src/common/fastjmp_x86.asm @@ -1,5 +1,5 @@ -; SPDX-FileCopyrightText: 2021 Connor McLaughlin -; SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +; SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +; SPDX-License-Identifier: CC-BY-NC-ND-4.0 IFDEF _M_X86_32 diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 18d74c9c7..61db4f431 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "assert.h" diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp index 5212287e7..2137c646f 100644 --- a/src/common/file_system.cpp +++ b/src/common/file_system.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "file_system.h" #include "assert.h" diff --git a/src/common/file_system.h b/src/common/file_system.h index f4f9303f2..7052af698 100644 --- a/src/common/file_system.h +++ b/src/common/file_system.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/gsvector.cpp b/src/common/gsvector.cpp index e1660b510..448ddcae8 100644 --- a/src/common/gsvector.cpp +++ b/src/common/gsvector.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gsvector.h" diff --git a/src/common/gsvector.h b/src/common/gsvector.h index 0054699a0..b343a43c9 100644 --- a/src/common/gsvector.h +++ b/src/common/gsvector.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // // Lightweight wrapper over native SIMD types for cross-platform vector code. diff --git a/src/common/gsvector_formatter.h b/src/common/gsvector_formatter.h index 5ed7c1665..9a09d6004 100644 --- a/src/common/gsvector_formatter.h +++ b/src/common/gsvector_formatter.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h index e4991af5e..11db729b8 100644 --- a/src/common/gsvector_neon.h +++ b/src/common/gsvector_neon.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/intrin.h" #include "common/types.h" diff --git a/src/common/gsvector_nosimd.h b/src/common/gsvector_nosimd.h index b460c4ca8..caa8df6d8 100644 --- a/src/common/gsvector_nosimd.h +++ b/src/common/gsvector_nosimd.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: LGPL-3.0+ +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Implementation of GSVector4/GSVector4i when the host does not support any form of SIMD. diff --git a/src/common/gsvector_sse.h b/src/common/gsvector_sse.h index b2ab9d9f9..2777f2a98 100644 --- a/src/common/gsvector_sse.h +++ b/src/common/gsvector_sse.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team, 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: LGPL-3.0+ +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // // Lightweight wrapper over native SIMD types for cross-platform vector code. // Rewritten and NEON+No-SIMD variants added for DuckStation. diff --git a/src/common/hash_combine.h b/src/common/hash_combine.h index 52188ba88..1eac0139d 100644 --- a/src/common/hash_combine.h +++ b/src/common/hash_combine.h @@ -1,7 +1,11 @@ -// https://stackoverflow.com/questions/2590677/how-do-i-combine-hash-values-in-c0x +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 + #pragma once + #include +// https://stackoverflow.com/questions/2590677/how-do-i-combine-hash-values-in-c0x template void hash_combine(std::size_t& seed, const T& v, const Rest&... rest) { diff --git a/src/common/heap_array.h b/src/common/heap_array.h index 2bc26ceb6..9aa0b0b78 100644 --- a/src/common/heap_array.h +++ b/src/common/heap_array.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/heterogeneous_containers.h b/src/common/heterogeneous_containers.h index 944907b4e..2f7bf35ee 100644 --- a/src/common/heterogeneous_containers.h +++ b/src/common/heterogeneous_containers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 /** * Provides a map template which doesn't require heap allocations for lookups. diff --git a/src/common/intrin.h b/src/common/intrin.h index 225cd4d97..145eb3f01 100644 --- a/src/common/intrin.h +++ b/src/common/intrin.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Includes appropriate intrinsic header based on platform. diff --git a/src/common/layered_settings_interface.cpp b/src/common/layered_settings_interface.cpp index 53ea6c6a7..53995bfb5 100644 --- a/src/common/layered_settings_interface.cpp +++ b/src/common/layered_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "layered_settings_interface.h" #include "common/assert.h" diff --git a/src/common/layered_settings_interface.h b/src/common/layered_settings_interface.h index 3d25f104a..a4c53756f 100644 --- a/src/common/layered_settings_interface.h +++ b/src/common/layered_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "settings_interface.h" diff --git a/src/common/log.cpp b/src/common/log.cpp index 0bde241bd..d20968925 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "log.h" #include "assert.h" diff --git a/src/common/log.h b/src/common/log.h index 128d6badf..55217e977 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/lru_cache.h b/src/common/lru_cache.h index 0e9d96fa3..55c9639c7 100644 --- a/src/common/lru_cache.h +++ b/src/common/lru_cache.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "heterogeneous_containers.h" diff --git a/src/common/md5_digest.cpp b/src/common/md5_digest.cpp index f45343c27..b72c1d945 100644 --- a/src/common/md5_digest.cpp +++ b/src/common/md5_digest.cpp @@ -1,26 +1,11 @@ +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 + #include "md5_digest.h" -// based heavily on this implementation: +// based heavily on this public-domain implementation: // http://www.fourmilab.ch/md5/ -#ifndef HIGHFIRST -#define byteReverse(buf, len) /* Nothing */ -#else -/* - * Note: this code is harmless on little-endian machines. - */ -static void byteReverse(unsigned char* buf, unsigned longs) -{ - u32 t; - do - { - t = (u32)((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); - *(u32*)buf = t; - buf += 4; - } while (--longs); -} -#endif - /* The four core functions - F1 is optimized somewhat */ /* #define F1(x, y, z) (x & y | ~x & z) */ @@ -174,7 +159,6 @@ void MD5Digest::Update(const void* pData, u32 cbData) return; } std::memcpy(p, pByteData, t); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); pByteData += t; cbData -= t; @@ -184,7 +168,6 @@ void MD5Digest::Update(const void* pData, u32 cbData) while (cbData >= 64) { std::memcpy(this->in, pByteData, 64); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); pByteData += 64; cbData -= 64; @@ -222,7 +205,6 @@ void MD5Digest::Final(std::span digest) { /* Two lots of padding: Pad the first block to 64 bytes */ std::memset(p, 0, count); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); /* Now fill the next block with 56 bytes */ @@ -233,13 +215,11 @@ void MD5Digest::Final(std::span digest) /* Pad block to 56 bytes */ std::memset(p, 0, count - 8); } - byteReverse(this->in, 14); /* Append length in bits and transform */ ((u32*)this->in)[14] = this->bits[0]; ((u32*)this->in)[15] = this->bits[1]; MD5Transform(this->buf, (u32*)this->in); - byteReverse((unsigned char*)this->buf, 4); std::memcpy(digest.data(), this->buf, 16); } diff --git a/src/common/md5_digest.h b/src/common/md5_digest.h index bf03a6e10..899871deb 100644 --- a/src/common/md5_digest.h +++ b/src/common/md5_digest.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "types.h" #include diff --git a/src/common/memmap.cpp b/src/common/memmap.cpp index 10d38c068..b9673ff39 100644 --- a/src/common/memmap.cpp +++ b/src/common/memmap.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memmap.h" #include "align.h" diff --git a/src/common/memmap.h b/src/common/memmap.h index f7ca87797..accb48531 100644 --- a/src/common/memmap.h +++ b/src/common/memmap.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/memory_settings_interface.cpp b/src/common/memory_settings_interface.cpp index 732ec20c2..57d8c6f24 100644 --- a/src/common/memory_settings_interface.cpp +++ b/src/common/memory_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memory_settings_interface.h" diff --git a/src/common/memory_settings_interface.h b/src/common/memory_settings_interface.h index b1ca083b4..a4a59c797 100644 --- a/src/common/memory_settings_interface.h +++ b/src/common/memory_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "heterogeneous_containers.h" diff --git a/src/common/minizip_helpers.h b/src/common/minizip_helpers.h index 926e598c4..c07f0cccf 100644 --- a/src/common/minizip_helpers.h +++ b/src/common/minizip_helpers.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/path.h b/src/common/path.h index cd78aeab8..c39bb05b6 100644 --- a/src/common/path.h +++ b/src/common/path.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/perf_scope.cpp b/src/common/perf_scope.cpp index ad679dabd..7b7507b63 100644 --- a/src/common/perf_scope.cpp +++ b/src/common/perf_scope.cpp @@ -1,6 +1,5 @@ - -// SPDX-FileCopyrightText: 2023 Connor McLaughlin , PCSX2 Team -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "perf_scope.h" #include "assert.h" diff --git a/src/common/perf_scope.h b/src/common/perf_scope.h index 803b62297..b85d54d83 100644 --- a/src/common/perf_scope.h +++ b/src/common/perf_scope.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin , PCSX2 Team -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/progress_callback.cpp b/src/common/progress_callback.cpp index eeeb94add..2c35595f4 100644 --- a/src/common/progress_callback.cpp +++ b/src/common/progress_callback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "progress_callback.h" #include "assert.h" diff --git a/src/common/progress_callback.h b/src/common/progress_callback.h index 106bd9574..05840d6c6 100644 --- a/src/common/progress_callback.h +++ b/src/common/progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/scoped_guard.h b/src/common/scoped_guard.h index dc2f813a2..e97f2a38b 100644 --- a/src/common/scoped_guard.h +++ b/src/common/scoped_guard.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/common/settings_interface.h b/src/common/settings_interface.h index baa17914e..068fccbe7 100644 --- a/src/common/settings_interface.h +++ b/src/common/settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/sha1_digest.cpp b/src/common/sha1_digest.cpp index 5158fb4f3..72385e456 100644 --- a/src/common/sha1_digest.cpp +++ b/src/common/sha1_digest.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "sha1_digest.h" #include "assert.h" diff --git a/src/common/sha1_digest.h b/src/common/sha1_digest.h index eac925cc0..9fc0179dc 100644 --- a/src/common/sha1_digest.h +++ b/src/common/sha1_digest.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/common/small_string.cpp b/src/common/small_string.cpp index ef1f1faf0..05cb58a13 100644 --- a/src/common/small_string.cpp +++ b/src/common/small_string.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "small_string.h" #include "assert.h" diff --git a/src/common/small_string.h b/src/common/small_string.h index 172eed6bd..4237ed291 100644 --- a/src/common/small_string.h +++ b/src/common/small_string.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "types.h" #include "fmt/core.h" diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 9f307b5ae..d4ae21e46 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "string_util.h" #include "assert.h" diff --git a/src/common/string_util.h b/src/common/string_util.h index 6656ed9ed..c99a21707 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "types.h" #include #include diff --git a/src/common/threading.cpp b/src/common/threading.cpp index 8dacce838..c72d603ef 100644 --- a/src/common/threading.cpp +++ b/src/common/threading.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "threading.h" #include "assert.h" diff --git a/src/common/threading.h b/src/common/threading.h index 49686bc36..b9efa54b9 100644 --- a/src/common/threading.h +++ b/src/common/threading.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/common/timer.cpp b/src/common/timer.cpp index c3aaf6009..fc547c637 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "timer.h" #include "types.h" diff --git a/src/common/timer.h b/src/common/timer.h index 4206cad9a..33db85db8 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include diff --git a/src/common/types.h b/src/common/types.h index 2bc435636..6550347c0 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include #include #include diff --git a/src/common/windows_headers.h b/src/common/windows_headers.h index ba4d60f3d..5cbc15423 100644 --- a/src/common/windows_headers.h +++ b/src/common/windows_headers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index 8a9cabafd..a1c2fa086 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // TODO: Don't poll when booting the game, e.g. Crash Warped freaks out. diff --git a/src/core/achievements.h b/src/core/achievements.h index d756077ac..c8bc63075 100644 --- a/src/core/achievements.h +++ b/src/core/achievements.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/achievements_private.h b/src/core/achievements_private.h index f3db1df11..0444d4c0c 100644 --- a/src/core/achievements_private.h +++ b/src/core/achievements_private.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp index 38133bb9f..ca862608e 100644 --- a/src/core/analog_controller.cpp +++ b/src/core/analog_controller.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "analog_controller.h" #include "host.h" diff --git a/src/core/analog_controller.h b/src/core/analog_controller.h index e978f35e3..0e6756fc7 100644 --- a/src/core/analog_controller.h +++ b/src/core/analog_controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/analog_joystick.cpp b/src/core/analog_joystick.cpp index 4aa4804fc..cdc6ade1b 100644 --- a/src/core/analog_joystick.cpp +++ b/src/core/analog_joystick.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "analog_joystick.h" #include "host.h" diff --git a/src/core/analog_joystick.h b/src/core/analog_joystick.h index 456aa3c9d..a7953a5b2 100644 --- a/src/core/analog_joystick.h +++ b/src/core/analog_joystick.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/bios.cpp b/src/core/bios.cpp index 39302a624..44d15bcf0 100644 --- a/src/core/bios.cpp +++ b/src/core/bios.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "bios.h" #include "cpu_disasm.h" diff --git a/src/core/bios.h b/src/core/bios.h index 86bfbe75f..3a17c0b34 100644 --- a/src/core/bios.h +++ b/src/core/bios.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 91246ae28..c55549f33 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "bus.h" #include "bios.h" diff --git a/src/core/bus.h b/src/core/bus.h index ce1088c66..5002c9036 100644 --- a/src/core/bus.h +++ b/src/core/bus.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 42b1f2220..d3132151e 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cdrom.h" #include "cdrom_async_reader.h" diff --git a/src/core/cdrom.h b/src/core/cdrom.h index 15c942e35..944ff3f75 100644 --- a/src/core/cdrom.h +++ b/src/core/cdrom.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/core/cdrom_async_reader.cpp b/src/core/cdrom_async_reader.cpp index f9d15247b..5c599ffc9 100644 --- a/src/core/cdrom_async_reader.cpp +++ b/src/core/cdrom_async_reader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cdrom_async_reader.h" #include "common/assert.h" diff --git a/src/core/cdrom_async_reader.h b/src/core/cdrom_async_reader.h index 262cbdfa2..5e93405b9 100644 --- a/src/core/cdrom_async_reader.h +++ b/src/core/cdrom_async_reader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "util/cd_image.h" diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index 94dfce97c..9a4c65333 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cheats.h" #include "bus.h" diff --git a/src/core/cheats.h b/src/core/cheats.h index c56990402..9f6b03730 100644 --- a/src/core/cheats.h +++ b/src/core/cheats.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/controller.cpp b/src/core/controller.cpp index ee266f621..571677cd7 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "controller.h" #include "analog_controller.h" diff --git a/src/core/controller.h b/src/core/controller.h index 003695c00..e8ce68333 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp index c32d19209..96b8c33fa 100644 --- a/src/core/cpu_code_cache.cpp +++ b/src/core/cpu_code_cache.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "bus.h" #include "cpu_code_cache_private.h" diff --git a/src/core/cpu_code_cache.h b/src/core/cpu_code_cache.h index 171e269df..58fc849f2 100644 --- a/src/core/cpu_code_cache.h +++ b/src/core/cpu_code_cache.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cpu_code_cache_private.h b/src/core/cpu_code_cache_private.h index be1c05108..5b1db603b 100644 --- a/src/core/cpu_code_cache_private.h +++ b/src/core/cpu_code_cache_private.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cpu_core.cpp b/src/core/cpu_core.cpp index b57f7b7e5..3534119a6 100644 --- a/src/core/cpu_core.cpp +++ b/src/core/cpu_core.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_core.h" #include "bus.h" diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h index dc877fb09..78c216b37 100644 --- a/src/core/cpu_core.h +++ b/src/core/cpu_core.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cpu_core_private.h b/src/core/cpu_core_private.h index 1cfe91697..7e52952cd 100644 --- a/src/core/cpu_core_private.h +++ b/src/core/cpu_core_private.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "bus.h" diff --git a/src/core/cpu_disasm.cpp b/src/core/cpu_disasm.cpp index 90e14240f..926004d58 100644 --- a/src/core/cpu_disasm.cpp +++ b/src/core/cpu_disasm.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_disasm.h" #include "cpu_core.h" diff --git a/src/core/cpu_disasm.h b/src/core/cpu_disasm.h index 460b1b97d..4a4aa4bc2 100644 --- a/src/core/cpu_disasm.h +++ b/src/core/cpu_disasm.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "cpu_types.h" diff --git a/src/core/cpu_newrec_compiler.cpp b/src/core/cpu_newrec_compiler.cpp index 35cb6f25c..7da379f65 100644 --- a/src/core/cpu_newrec_compiler.cpp +++ b/src/core/cpu_newrec_compiler.cpp @@ -1,17 +1,20 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_newrec_compiler.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/small_string.h" #include "cpu_code_cache.h" #include "cpu_core_private.h" #include "cpu_disasm.h" #include "cpu_pgxp.h" #include "settings.h" + +#include "common/assert.h" +#include "common/log.h" +#include "common/small_string.h" + #include #include + Log_SetChannel(NewRec::Compiler); // TODO: direct link skip delay slot check diff --git a/src/core/cpu_newrec_compiler.h b/src/core/cpu_newrec_compiler.h index d1e184040..698e3ffcd 100644 --- a/src/core/cpu_newrec_compiler.h +++ b/src/core/cpu_newrec_compiler.h @@ -1,10 +1,12 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "cpu_code_cache_private.h" #include "cpu_recompiler_types.h" #include "cpu_types.h" + #include #include #include diff --git a/src/core/cpu_newrec_compiler_aarch32.cpp b/src/core/cpu_newrec_compiler_aarch32.cpp index 0d0347049..b5ad59b83 100644 --- a/src/core/cpu_newrec_compiler_aarch32.cpp +++ b/src/core/cpu_newrec_compiler_aarch32.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_newrec_compiler_aarch32.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" #include "cpu_recompiler_thunks.h" @@ -13,6 +9,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_ARM32 diff --git a/src/core/cpu_newrec_compiler_aarch32.h b/src/core/cpu_newrec_compiler_aarch32.h index 604330d82..e506ad098 100644 --- a/src/core/cpu_newrec_compiler_aarch32.h +++ b/src/core/cpu_newrec_compiler_aarch32.h @@ -1,9 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_ARM32 diff --git a/src/core/cpu_newrec_compiler_aarch64.cpp b/src/core/cpu_newrec_compiler_aarch64.cpp index 45d4c8674..7df73e252 100644 --- a/src/core/cpu_newrec_compiler_aarch64.cpp +++ b/src/core/cpu_newrec_compiler_aarch64.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_newrec_compiler_aarch64.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" #include "cpu_recompiler_thunks.h" @@ -13,6 +9,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_ARM64 diff --git a/src/core/cpu_newrec_compiler_aarch64.h b/src/core/cpu_newrec_compiler_aarch64.h index e30c26986..fd0dbb38f 100644 --- a/src/core/cpu_newrec_compiler_aarch64.h +++ b/src/core/cpu_newrec_compiler_aarch64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_ARM64 diff --git a/src/core/cpu_newrec_compiler_riscv64.cpp b/src/core/cpu_newrec_compiler_riscv64.cpp index 61a6557ac..228fdd879 100644 --- a/src/core/cpu_newrec_compiler_riscv64.cpp +++ b/src/core/cpu_newrec_compiler_riscv64.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_newrec_compiler_riscv64.h" #include "cpu_code_cache_private.h" diff --git a/src/core/cpu_newrec_compiler_riscv64.h b/src/core/cpu_newrec_compiler_riscv64.h index 55ec6d142..0d41bb035 100644 --- a/src/core/cpu_newrec_compiler_riscv64.h +++ b/src/core/cpu_newrec_compiler_riscv64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_RISCV64 diff --git a/src/core/cpu_newrec_compiler_x64.cpp b/src/core/cpu_newrec_compiler_x64.cpp index 2bb4f6776..d2357ee83 100644 --- a/src/core/cpu_newrec_compiler_x64.cpp +++ b/src/core/cpu_newrec_compiler_x64.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_newrec_compiler_x64.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_code_cache_private.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" @@ -14,6 +10,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_X64 diff --git a/src/core/cpu_newrec_compiler_x64.h b/src/core/cpu_newrec_compiler_x64.h index 10205406d..fe2be408f 100644 --- a/src/core/cpu_newrec_compiler_x64.h +++ b/src/core/cpu_newrec_compiler_x64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_X64 diff --git a/src/core/cpu_pgxp.cpp b/src/core/cpu_pgxp.cpp index 136eb14fb..b4b57430e 100644 --- a/src/core/cpu_pgxp.cpp +++ b/src/core/cpu_pgxp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // // This file has been completely rewritten over the years compared to the original PCSXR-PGXP release. // No original code remains. The original copyright notice is included above for historical purposes. diff --git a/src/core/cpu_pgxp.h b/src/core/cpu_pgxp.h index 108a312d1..f57f2b48a 100644 --- a/src/core/cpu_pgxp.h +++ b/src/core/cpu_pgxp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "cpu_core.h" diff --git a/src/core/cpu_recompiler_code_generator.cpp b/src/core/cpu_recompiler_code_generator.cpp index fc05b7a0d..d9f456e21 100644 --- a/src/core/cpu_recompiler_code_generator.cpp +++ b/src/core/cpu_recompiler_code_generator.cpp @@ -1,14 +1,16 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_recompiler_code_generator.h" -#include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" #include "cpu_disasm.h" #include "cpu_pgxp.h" #include "gte.h" #include "settings.h" + +#include "common/log.h" + Log_SetChannel(CPU::Recompiler); // TODO: Turn load+sext/zext into a single signed/unsigned load diff --git a/src/core/cpu_recompiler_code_generator.h b/src/core/cpu_recompiler_code_generator.h index c6b53eb1c..5c3b931fb 100644 --- a/src/core/cpu_recompiler_code_generator.h +++ b/src/core/cpu_recompiler_code_generator.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/cpu_recompiler_code_generator_aarch32.cpp b/src/core/cpu_recompiler_code_generator_aarch32.cpp index c9a53236c..43a73a3cb 100644 --- a/src/core/cpu_recompiler_code_generator_aarch32.cpp +++ b/src/core/cpu_recompiler_code_generator_aarch32.cpp @@ -1,10 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) - -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/memmap.h" +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" @@ -14,6 +9,11 @@ #include "settings.h" #include "timing_event.h" +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/memmap.h" + #ifdef CPU_ARCH_ARM32 Log_SetChannel(CPU::Recompiler); diff --git a/src/core/cpu_recompiler_code_generator_aarch64.cpp b/src/core/cpu_recompiler_code_generator_aarch64.cpp index 57b67d446..825da398e 100644 --- a/src/core/cpu_recompiler_code_generator_aarch64.cpp +++ b/src/core/cpu_recompiler_code_generator_aarch64.cpp @@ -1,10 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) - -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/memmap.h" +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" @@ -14,6 +9,11 @@ #include "settings.h" #include "timing_event.h" +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/memmap.h" + #ifdef CPU_ARCH_ARM64 Log_SetChannel(CPU::Recompiler); diff --git a/src/core/cpu_recompiler_code_generator_generic.cpp b/src/core/cpu_recompiler_code_generator_generic.cpp index 0b3f262c9..c8b229275 100644 --- a/src/core/cpu_recompiler_code_generator_generic.cpp +++ b/src/core/cpu_recompiler_code_generator_generic.cpp @@ -1,11 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 -#include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" #include "cpu_recompiler_code_generator.h" #include "settings.h" + +#include "common/log.h" + Log_SetChannel(Recompiler::CodeGenerator); namespace CPU::Recompiler { diff --git a/src/core/cpu_recompiler_code_generator_x64.cpp b/src/core/cpu_recompiler_code_generator_x64.cpp index 88eceac46..115a35ecc 100644 --- a/src/core/cpu_recompiler_code_generator_x64.cpp +++ b/src/core/cpu_recompiler_code_generator_x64.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" diff --git a/src/core/cpu_recompiler_register_cache.cpp b/src/core/cpu_recompiler_register_cache.cpp index 5b1737cf7..3c29226b1 100644 --- a/src/core/cpu_recompiler_register_cache.cpp +++ b/src/core/cpu_recompiler_register_cache.cpp @@ -1,10 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_recompiler_register_cache.h" -#include "common/log.h" #include "cpu_recompiler_code_generator.h" + +#include "common/log.h" + #include + Log_SetChannel(CPU::Recompiler); namespace CPU::Recompiler { diff --git a/src/core/cpu_recompiler_register_cache.h b/src/core/cpu_recompiler_register_cache.h index 305e93292..717e55a60 100644 --- a/src/core/cpu_recompiler_register_cache.h +++ b/src/core/cpu_recompiler_register_cache.h @@ -1,11 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once -#include "common/assert.h" + #include "cpu_recompiler_types.h" #include "cpu_types.h" +#include "common/assert.h" + #if defined(CPU_ARCH_ARM32) #include "vixl/aarch32/macro-assembler-aarch32.h" #elif defined(CPU_ARCH_ARM64) diff --git a/src/core/cpu_recompiler_thunks.h b/src/core/cpu_recompiler_thunks.h index e72b2b680..61272c708 100644 --- a/src/core/cpu_recompiler_thunks.h +++ b/src/core/cpu_recompiler_thunks.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "cpu_code_cache.h" #include "cpu_types.h" diff --git a/src/core/cpu_recompiler_types.h b/src/core/cpu_recompiler_types.h index 4a0e3e330..5a2f9ad51 100644 --- a/src/core/cpu_recompiler_types.h +++ b/src/core/cpu_recompiler_types.h @@ -1,9 +1,10 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Shared code between recompiler backends. #pragma once + #include "cpu_types.h" #include diff --git a/src/core/cpu_types.cpp b/src/core/cpu_types.cpp index 9b4312d5a..f91c1b4a2 100644 --- a/src/core/cpu_types.cpp +++ b/src/core/cpu_types.cpp @@ -1,8 +1,10 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cpu_types.h" + #include "common/assert.h" + #include static const std::array s_reg_names = { diff --git a/src/core/cpu_types.h b/src/core/cpu_types.h index 5defc4900..a3c32e82c 100644 --- a/src/core/cpu_types.h +++ b/src/core/cpu_types.h @@ -1,10 +1,13 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + +#include "types.h" + #include "common/bitfield.h" #include "common/bitutils.h" -#include "types.h" + #include namespace CPU { diff --git a/src/core/digital_controller.cpp b/src/core/digital_controller.cpp index 6445d0759..d0415a920 100644 --- a/src/core/digital_controller.cpp +++ b/src/core/digital_controller.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "digital_controller.h" #include "host.h" diff --git a/src/core/digital_controller.h b/src/core/digital_controller.h index c4c689b59..4c23bcdb1 100644 --- a/src/core/digital_controller.h +++ b/src/core/digital_controller.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/dma.cpp b/src/core/dma.cpp index 589d0a0f2..5a4a11902 100644 --- a/src/core/dma.cpp +++ b/src/core/dma.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "dma.h" #include "bus.h" diff --git a/src/core/dma.h b/src/core/dma.h index 3c7c99fb7..b92db0592 100644 --- a/src/core/dma.h +++ b/src/core/dma.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "types.h" class StateWrapper; diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index d2650eef4..fc9a06f1a 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "fullscreen_ui.h" #include "achievements.h" @@ -3171,9 +3171,10 @@ void FullscreenUI::DrawInterfaceSettingsPage() bsi, FSUI_ICONSTR(ICON_FA_STOPWATCH, "Show Latency Statistics"), FSUI_CSTR("Shows information about input and audio latency in the top-right corner of the display."), "Display", "ShowLatencyStatistics", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_BATTERY_HALF, "Show CPU Usage"), - FSUI_CSTR("Shows the host's CPU usage based on threads in the top-right corner of the display."), - "Display", "ShowCPU", false); + DrawToggleSetting( + bsi, FSUI_ICONSTR(ICON_FA_BATTERY_HALF, "Show CPU Usage"), + FSUI_CSTR("Shows the host's CPU usage of each system thread in the top-right corner of the display."), "Display", + "ShowCPU", false); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_SPINNER, "Show GPU Usage"), FSUI_CSTR("Shows the host's GPU usage in the top-right corner of the display."), "Display", "ShowGPU", false); @@ -4400,11 +4401,6 @@ void FullscreenUI::DrawDisplaySettingsPage() &Settings::GetLineDetectModeName, &Settings::GetLineDetectModeDisplayName, GPULineDetectMode::Count, resolution_scale > 1); - DrawToggleSetting( - bsi, FSUI_CSTR("True Color Debanding"), - FSUI_CSTR("Applies modern dithering techniques to further smooth out gradients when true color is enabled."), - "GPU", "Debanding", false, true_color_enabled); - DrawToggleSetting( bsi, FSUI_CSTR("Scaled Dithering"), FSUI_CSTR("Scales the dithering pattern with the internal rendering resolution, making it less noticeable. " @@ -7237,7 +7233,6 @@ TRANSLATE_NOOP("FullscreenUI", "Allow Booting Without SBI File"); TRANSLATE_NOOP("FullscreenUI", "Allows loading protected games without subchannel information."); TRANSLATE_NOOP("FullscreenUI", "An error occurred while deleting empty game settings:\n{}"); TRANSLATE_NOOP("FullscreenUI", "An error occurred while saving game settings:\n{}"); -TRANSLATE_NOOP("FullscreenUI", "Applies modern dithering techniques to further smooth out gradients when true color is enabled."); TRANSLATE_NOOP("FullscreenUI", "Apply Image Patches"); TRANSLATE_NOOP("FullscreenUI", "Are you sure you want to clear the current post-processing chain? All configuration will be lost."); TRANSLATE_NOOP("FullscreenUI", "Aspect Ratio"); @@ -7716,7 +7711,7 @@ TRANSLATE_NOOP("FullscreenUI", "Shows the current controller state of the system TRANSLATE_NOOP("FullscreenUI", "Shows the current emulation speed of the system in the top-right corner of the display as a percentage."); TRANSLATE_NOOP("FullscreenUI", "Shows the current rendering resolution of the system in the top-right corner of the display."); TRANSLATE_NOOP("FullscreenUI", "Shows the game you are currently playing as part of your profile in Discord."); -TRANSLATE_NOOP("FullscreenUI", "Shows the host's CPU usage based on threads in the top-right corner of the display."); +TRANSLATE_NOOP("FullscreenUI", "Shows the host's CPU usage of each system thread in the top-right corner of the display."); TRANSLATE_NOOP("FullscreenUI", "Shows the host's GPU usage in the top-right corner of the display."); TRANSLATE_NOOP("FullscreenUI", "Shows the number of frames (or v-syncs) displayed per second by the system in the top-right corner of the display."); TRANSLATE_NOOP("FullscreenUI", "Simulates the CPU's instruction cache in the recompiler. Can help with games running too fast."); @@ -7774,7 +7769,6 @@ TRANSLATE_NOOP("FullscreenUI", "Toggle Analog"); TRANSLATE_NOOP("FullscreenUI", "Toggle Fast Forward"); TRANSLATE_NOOP("FullscreenUI", "Toggle Fullscreen"); TRANSLATE_NOOP("FullscreenUI", "Toggle every %d frames"); -TRANSLATE_NOOP("FullscreenUI", "True Color Debanding"); TRANSLATE_NOOP("FullscreenUI", "True Color Rendering"); TRANSLATE_NOOP("FullscreenUI", "Turbo Speed"); TRANSLATE_NOOP("FullscreenUI", "Type"); @@ -7803,6 +7797,7 @@ TRANSLATE_NOOP("FullscreenUI", "Uses perspective-correct interpolation for color TRANSLATE_NOOP("FullscreenUI", "Uses perspective-correct interpolation for texture coordinates, straightening out warped textures."); TRANSLATE_NOOP("FullscreenUI", "Uses screen positions to resolve PGXP data. May improve visuals in some games."); TRANSLATE_NOOP("FullscreenUI", "Value: {} | Default: {} | Minimum: {} | Maximum: {}"); +TRANSLATE_NOOP("FullscreenUI", "Version: %s"); TRANSLATE_NOOP("FullscreenUI", "Vertex Cache"); TRANSLATE_NOOP("FullscreenUI", "Vertical Sync (VSync)"); TRANSLATE_NOOP("FullscreenUI", "WARNING: Your game is still saving to the memory card. Continuing to {0} may IRREVERSIBLY DESTROY YOUR MEMORY CARD. We recommend resuming your game and waiting 5 seconds for it to finish saving.\n\nDo you want to {0} anyway?"); @@ -7829,6 +7824,5 @@ TRANSLATE_NOOP("FullscreenUI", "{} Frames"); TRANSLATE_NOOP("FullscreenUI", "{} deleted."); TRANSLATE_NOOP("FullscreenUI", "{} does not exist."); TRANSLATE_NOOP("FullscreenUI", "{} is not a valid disc image."); -TRANSLATE_NOOP("FullscreenUI", "Version: %s"); // TRANSLATION-STRING-AREA-END #endif diff --git a/src/core/fullscreen_ui.h b/src/core/fullscreen_ui.h index 5942239f3..430382f01 100644 --- a/src/core/fullscreen_ui.h +++ b/src/core/fullscreen_ui.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/game_database.cpp b/src/core/game_database.cpp index 5c1698fe8..5752192e4 100644 --- a/src/core/game_database.cpp +++ b/src/core/game_database.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "game_database.h" #include "controller.h" diff --git a/src/core/game_database.h b/src/core/game_database.h index 768817351..2970fdd70 100644 --- a/src/core/game_database.h +++ b/src/core/game_database.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "core/types.h" diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index 3b8c7c5ee..9ca78f6a8 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "game_list.h" #include "bios.h" diff --git a/src/core/game_list.h b/src/core/game_list.h index 723f4885d..ada9150d7 100644 --- a/src/core/game_list.h +++ b/src/core/game_list.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gdb_server.cpp b/src/core/gdb_server.cpp index 59282107d..b9c561d93 100644 --- a/src/core/gdb_server.cpp +++ b/src/core/gdb_server.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gdb_server.h" #include "bus.h" diff --git a/src/core/gdb_server.h b/src/core/gdb_server.h index 6e80d4612..67e496a7c 100644 --- a/src/core/gdb_server.h +++ b/src/core/gdb_server.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp index 0c7ae279a..55e26efd6 100644 --- a/src/core/gpu.cpp +++ b/src/core/gpu.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu.h" #include "dma.h" diff --git a/src/core/gpu.h b/src/core/gpu.h index 76cb8768a..14596f1ae 100644 --- a/src/core/gpu.h +++ b/src/core/gpu.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "gpu_types.h" #include "timers.h" #include "timing_event.h" diff --git a/src/core/gpu_backend.cpp b/src/core/gpu_backend.cpp index 57508ff78..a27b7591f 100644 --- a/src/core/gpu_backend.cpp +++ b/src/core/gpu_backend.cpp @@ -1,12 +1,15 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_backend.h" +#include "settings.h" + +#include "util/state_wrapper.h" + #include "common/align.h" #include "common/log.h" #include "common/timer.h" -#include "settings.h" -#include "util/state_wrapper.h" + Log_SetChannel(GPUBackend); std::unique_ptr g_gpu_backend; diff --git a/src/core/gpu_backend.h b/src/core/gpu_backend.h index b58df358c..4cf123f06 100644 --- a/src/core/gpu_backend.h +++ b/src/core/gpu_backend.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp index 3fe1c9eb0..6bc3effee 100644 --- a/src/core/gpu_commands.cpp +++ b/src/core/gpu_commands.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu.h" #include "interrupt_controller.h" diff --git a/src/core/gpu_hw.cpp b/src/core/gpu_hw.cpp index 84c05a926..31d4acc11 100644 --- a/src/core/gpu_hw.cpp +++ b/src/core/gpu_hw.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_hw.h" #include "cpu_core.h" @@ -23,8 +23,8 @@ #include "common/string_util.h" #include "common/timer.h" -#include "IconsFontAwesome5.h" #include "IconsEmoji.h" +#include "IconsFontAwesome5.h" #include "imgui.h" #include @@ -398,7 +398,7 @@ void GPU_HW::UpdateSettings(const Settings& old_settings) m_pgxp_depth_buffer != g_settings.UsingPGXPDepthBuffer()); const bool shaders_changed = (m_resolution_scale != resolution_scale || m_multisamples != multisamples || - m_true_color != g_settings.gpu_true_color || g_settings.gpu_debanding != old_settings.gpu_debanding || + m_true_color != g_settings.gpu_true_color || (multisamples > 0 && g_settings.gpu_per_sample_shading != old_settings.gpu_per_sample_shading) || (resolution_scale > 1 && g_settings.gpu_scaled_dithering != old_settings.gpu_scaled_dithering) || (resolution_scale > 1 && g_settings.gpu_texture_filter == GPUTextureFilter::Nearest && @@ -643,20 +643,8 @@ u32 GPU_HW::CalculateResolutionScale() const static_cast(m_crtc_state.display_height) : (m_console_is_pal ? (PAL_VERTICAL_ACTIVE_END - PAL_VERTICAL_ACTIVE_START) : (NTSC_VERTICAL_ACTIVE_END - NTSC_VERTICAL_ACTIVE_START)); - - float widescreen_multiplier = 1.0f; - if (g_settings.gpu_widescreen_hack) - { - // Multiply scale factor by aspect ratio relative to 4:3, so that widescreen resolution is as close as possible to - // native screen resolution. Otherwise, anamorphic stretching would result in increasingly less horizontal - // resolution (relative to native screen resolution) as the aspect ratio gets wider. - widescreen_multiplier = std::max(1.0f, (static_cast(g_gpu_device->GetWindowWidth()) / - static_cast(g_gpu_device->GetWindowHeight())) / - (4.0f / 3.0f)); - } - const s32 preferred_scale = - static_cast(std::ceil(static_cast(g_gpu_device->GetWindowHeight() * widescreen_multiplier) / height)); + static_cast(std::ceil(static_cast(g_gpu_device->GetWindowHeight()) / height)); VERBOSE_LOG("Height = {}, preferred scale = {}", height, preferred_scale); scale = static_cast(std::clamp(preferred_scale, 1, max_resolution_scale)); @@ -771,10 +759,7 @@ void GPU_HW::PrintSettingsToLog() (g_settings.gpu_per_sample_shading && g_gpu_device->GetFeatures().per_sample_shading) ? " (per sample shading)" : ""); - INFO_LOG("Dithering: {}{}", m_true_color ? "Disabled" : "Enabled", - (!m_true_color && g_settings.gpu_scaled_dithering) ? - " (Scaled)" : - ((m_true_color && g_settings.gpu_debanding) ? " (Debanding)" : "")); + INFO_LOG("Dithering: {}", m_true_color ? "Disabled" : "Enabled", (!m_true_color && g_settings.gpu_scaled_dithering)); INFO_LOG("Force round texture coordinates: {}", (m_resolution_scale > 1 && g_settings.gpu_force_round_texcoords) ? "Enabled" : "Disabled"); INFO_LOG("Texture Filtering: {}/{}", Settings::GetTextureFilterDisplayName(m_texture_filtering), @@ -984,7 +969,7 @@ bool GPU_HW::CompilePipelines(Error* error) GPU_HW_ShaderGen shadergen(g_gpu_device->GetRenderAPI(), m_resolution_scale, m_multisamples, per_sample_shading, m_true_color, (m_resolution_scale > 1 && g_settings.gpu_scaled_dithering), m_write_mask_as_depth, ShouldDisableColorPerspective(), m_supports_dual_source_blend, - m_supports_framebuffer_fetch, g_settings.gpu_true_color && g_settings.gpu_debanding); + m_supports_framebuffer_fetch); const u32 active_texture_modes = m_allow_sprite_mode ? NUM_TEXTURE_MODES : @@ -3981,12 +3966,6 @@ void GPU_HW::DrawRendererStats() ImGui::TextColored(m_true_color ? active_color : inactive_color, m_true_color ? "Enabled" : "Disabled"); ImGui::NextColumn(); - const bool debanding = (g_settings.gpu_true_color && g_settings.gpu_debanding); - ImGui::TextUnformatted("Debanding:"); - ImGui::NextColumn(); - ImGui::TextColored(debanding ? active_color : inactive_color, debanding ? "Enabled" : "Disabled"); - ImGui::NextColumn(); - const bool scaled_dithering = (m_resolution_scale > 1 && g_settings.gpu_scaled_dithering); ImGui::TextUnformatted("Scaled Dithering:"); ImGui::NextColumn(); diff --git a/src/core/gpu_hw.h b/src/core/gpu_hw.h index 9131a5911..1ada1e17f 100644 --- a/src/core/gpu_hw.h +++ b/src/core/gpu_hw.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gpu_hw_shadergen.cpp b/src/core/gpu_hw_shadergen.cpp index 8bb639644..a01e044ef 100644 --- a/src/core/gpu_hw_shadergen.cpp +++ b/src/core/gpu_hw_shadergen.cpp @@ -1,5 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 +// +// NOTE: Some parts of this file have more permissive licenses. They are marked appropriately. +// #include "gpu_hw_shadergen.h" @@ -8,11 +11,11 @@ GPU_HW_ShaderGen::GPU_HW_ShaderGen(RenderAPI render_api, u32 resolution_scale, u32 multisamples, bool per_sample_shading, bool true_color, bool scaled_dithering, bool write_mask_as_depth, bool disable_color_perspective, - bool supports_dual_source_blend, bool supports_framebuffer_fetch, bool debanding) + bool supports_dual_source_blend, bool supports_framebuffer_fetch) : ShaderGen(render_api, GetShaderLanguageForAPI(render_api), supports_dual_source_blend, supports_framebuffer_fetch), m_resolution_scale(resolution_scale), m_multisamples(multisamples), m_per_sample_shading(per_sample_shading), m_true_color(true_color), m_scaled_dithering(scaled_dithering), m_write_mask_as_depth(write_mask_as_depth), - m_disable_color_perspective(disable_color_perspective), m_debanding(debanding) + m_disable_color_perspective(disable_color_perspective) { } @@ -727,8 +730,6 @@ std::string GPU_HW_ShaderGen::GenerateBatchFragmentShader( DefineMacro(ss, "PALETTE_8_BIT", texture_mode == GPU_HW::BatchTextureMode::Palette8Bit); DefineMacro(ss, "DITHERING", dithering); DefineMacro(ss, "DITHERING_SCALED", m_scaled_dithering); - // Debanding requires true color to work correctly. - DefineMacro(ss, "DEBANDING", m_true_color && m_debanding); DefineMacro(ss, "INTERLACING", interlacing); DefineMacro(ss, "TRUE_COLOR", m_true_color); DefineMacro(ss, "TEXTURE_FILTERING", texture_filtering != GPUTextureFilter::Nearest); @@ -861,24 +862,6 @@ float4 SampleFromVRAM(TEXPAGE_VALUE texpage, float2 coords) } #endif - -// From https://alex.vlachos.com/graphics/Alex_Vlachos_Advanced_VR_Rendering_GDC2015.pdf -// and https://www.shadertoy.com/view/MslGR8 (5th one starting from the bottom) -// NOTE: `frag_coord` is in pixels (i.e. not normalized UV). -float3 ApplyDebanding(float2 frag_coord) -{ -#if DEBANDING - // Iestyn's RGB dither (7 asm instructions) from Portal 2 X360, slightly modified for VR. - float ditherc = dot(vec2(171.0, 231.0), frag_coord); - float3 dither = float3(ditherc, ditherc, ditherc); - dither = fract(dither / float3(103.0, 71.0, 97.0)); - - // Subtract 0.5 to avoid slightly brightening the whole viewport. - return (dither - 0.5) / 255.0; -#else - return float3(0.0, 0.0, 0.0); -#endif -} )"; const u32 num_fragment_outputs = use_rov ? 0 : (use_dual_source ? 2 : 1); @@ -913,7 +896,7 @@ float3 ApplyDebanding(float2 frag_coord) ss << R"( { - uint3 vertcol = uint3(v_col0.rgb * float3(255.0, 255.0, 255.0) + ApplyDebanding(v_pos.xy)); + uint3 vertcol = uint3(v_col0.rgb * float3(255.0, 255.0, 255.0)); uint2 fragpos = uint2(v_pos.xy); bool semitransparent; @@ -956,7 +939,7 @@ float3 ApplyDebanding(float2 frag_coord) icolor = min(icolor >> 3, uint3(31u, 31u, 31u)); #endif #else - icolor = uint3(texcol.rgb * float3(255.0, 255.0, 255.0) + ApplyDebanding(v_pos.xy)); + icolor = uint3(texcol.rgb * float3(255.0, 255.0, 255.0)); icolor = (icolor * vertcol) >> 7; #if DITHERING icolor = ApplyDithering(fragpos, icolor); diff --git a/src/core/gpu_hw_shadergen.h b/src/core/gpu_hw_shadergen.h index e8ccf4947..ef442b836 100644 --- a/src/core/gpu_hw_shadergen.h +++ b/src/core/gpu_hw_shadergen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once @@ -12,7 +12,7 @@ class GPU_HW_ShaderGen : public ShaderGen public: GPU_HW_ShaderGen(RenderAPI render_api, u32 resolution_scale, u32 multisamples, bool per_sample_shading, bool true_color, bool scaled_dithering, bool write_mask_as_depth, bool disable_color_perspective, - bool supports_dual_source_blend, bool supports_framebuffer_fetch, bool debanding); + bool supports_dual_source_blend, bool supports_framebuffer_fetch); ~GPU_HW_ShaderGen(); std::string GenerateBatchVertexShader(bool textured, bool palette, bool uv_limits, bool force_round_texcoords, @@ -52,5 +52,4 @@ private: bool m_scaled_dithering; bool m_write_mask_as_depth; bool m_disable_color_perspective; - bool m_debanding; }; diff --git a/src/core/gpu_shadergen.cpp b/src/core/gpu_shadergen.cpp index 1be4e495a..6c9400c7f 100644 --- a/src/core/gpu_shadergen.cpp +++ b/src/core/gpu_shadergen.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_shadergen.h" diff --git a/src/core/gpu_shadergen.h b/src/core/gpu_shadergen.h index 171bc0a96..f3be9832a 100644 --- a/src/core/gpu_shadergen.h +++ b/src/core/gpu_shadergen.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gpu_sw.cpp b/src/core/gpu_sw.cpp index 56a88e779..f9ba57035 100644 --- a/src/core/gpu_sw.cpp +++ b/src/core/gpu_sw.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_sw.h" #include "system.h" diff --git a/src/core/gpu_sw.h b/src/core/gpu_sw.h index 515db17b5..a4a11e4d4 100644 --- a/src/core/gpu_sw.h +++ b/src/core/gpu_sw.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gpu_sw_backend.cpp b/src/core/gpu_sw_backend.cpp index cbf547d88..4a5cd5297 100644 --- a/src/core/gpu_sw_backend.cpp +++ b/src/core/gpu_sw_backend.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_sw_backend.h" #include "gpu.h" diff --git a/src/core/gpu_sw_backend.h b/src/core/gpu_sw_backend.h index 2c0394ebc..6c51c008b 100644 --- a/src/core/gpu_sw_backend.h +++ b/src/core/gpu_sw_backend.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gpu_types.h b/src/core/gpu_types.h index 7faadd71e..a6483a079 100644 --- a/src/core/gpu_types.h +++ b/src/core/gpu_types.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/gte.cpp b/src/core/gte.cpp index 6a81740fd..e43005471 100644 --- a/src/core/gte.cpp +++ b/src/core/gte.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gte.h" diff --git a/src/core/gte.h b/src/core/gte.h index c2249dd01..334a0cd15 100644 --- a/src/core/gte.h +++ b/src/core/gte.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "gte_types.h" diff --git a/src/core/gte_types.h b/src/core/gte_types.h index 5abb9e216..84ea19ce0 100644 --- a/src/core/gte_types.h +++ b/src/core/gte_types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/bitfield.h" diff --git a/src/core/guncon.cpp b/src/core/guncon.cpp index a794fd214..372908064 100644 --- a/src/core/guncon.cpp +++ b/src/core/guncon.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "guncon.h" #include "gpu.h" diff --git a/src/core/guncon.h b/src/core/guncon.h index ed8a5ebab..1b5292acf 100644 --- a/src/core/guncon.h +++ b/src/core/guncon.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/host.cpp b/src/core/host.cpp index 83aa56f9d..bbb881f86 100644 --- a/src/core/host.cpp +++ b/src/core/host.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "host.h" #include "fullscreen_ui.h" diff --git a/src/core/host.h b/src/core/host.h index 0d3aeae01..16316cbd1 100644 --- a/src/core/host.h +++ b/src/core/host.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/host_interface_progress_callback.cpp b/src/core/host_interface_progress_callback.cpp index 0bb8098fc..3f31991f1 100644 --- a/src/core/host_interface_progress_callback.cpp +++ b/src/core/host_interface_progress_callback.cpp @@ -1,9 +1,11 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "host_interface_progress_callback.h" -#include "common/log.h" #include "host.h" + +#include "common/log.h" + Log_SetChannel(HostInterfaceProgressCallback); HostInterfaceProgressCallback::HostInterfaceProgressCallback() : ProgressCallback() diff --git a/src/core/host_interface_progress_callback.h b/src/core/host_interface_progress_callback.h index d8358da94..3af69e7fd 100644 --- a/src/core/host_interface_progress_callback.h +++ b/src/core/host_interface_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/hotkeys.cpp b/src/core/hotkeys.cpp index 405e8c00c..818e5ac19 100644 --- a/src/core/hotkeys.cpp +++ b/src/core/hotkeys.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "achievements.h" #include "cpu_code_cache.h" diff --git a/src/core/imgui_overlays.cpp b/src/core/imgui_overlays.cpp index a1376553f..0d67797ad 100644 --- a/src/core/imgui_overlays.cpp +++ b/src/core/imgui_overlays.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "imgui_overlays.h" #include "cdrom.h" @@ -432,16 +432,7 @@ void ImGuiManager::DrawEnhancementsOverlay() text.append_format(" {}x{}", g_settings.gpu_multisamples, g_settings.gpu_per_sample_shading ? "SSAA" : "MSAA"); } if (g_settings.gpu_true_color) - { - if (g_settings.gpu_debanding) - { - text.append(" TrueColDeband"); - } - else - { - text.append(" TrueCol"); - } - } + text.append(" TrueCol"); if (g_settings.gpu_disable_interlacing) text.append(" ForceProg"); if (g_settings.gpu_force_ntsc_timings && System::GetRegion() == ConsoleRegion::PAL) diff --git a/src/core/imgui_overlays.h b/src/core/imgui_overlays.h index 0e8d47b4e..e433b53c4 100644 --- a/src/core/imgui_overlays.h +++ b/src/core/imgui_overlays.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/input_types.h b/src/core/input_types.h index a49d79502..06fb6fc01 100644 --- a/src/core/input_types.h +++ b/src/core/input_types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2022-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/core/interrupt_controller.cpp b/src/core/interrupt_controller.cpp index aabea79ec..a082b3b91 100644 --- a/src/core/interrupt_controller.cpp +++ b/src/core/interrupt_controller.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "interrupt_controller.h" #include "cpu_core.h" diff --git a/src/core/interrupt_controller.h b/src/core/interrupt_controller.h index 4f2dfe3cf..8851c5b7f 100644 --- a/src/core/interrupt_controller.h +++ b/src/core/interrupt_controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "types.h" diff --git a/src/core/justifier.cpp b/src/core/justifier.cpp index 0e435e31d..94c0264c6 100644 --- a/src/core/justifier.cpp +++ b/src/core/justifier.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "justifier.h" #include "gpu.h" diff --git a/src/core/justifier.h b/src/core/justifier.h index 6d09f8af5..b82eff6a1 100644 --- a/src/core/justifier.h +++ b/src/core/justifier.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/mdec.cpp b/src/core/mdec.cpp index 454cc151f..87ebbe274 100644 --- a/src/core/mdec.cpp +++ b/src/core/mdec.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "mdec.h" #include "cpu_core.h" diff --git a/src/core/mdec.h b/src/core/mdec.h index ec3e79f36..5de021433 100644 --- a/src/core/mdec.h +++ b/src/core/mdec.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "types.h" class StateWrapper; diff --git a/src/core/memory_card.cpp b/src/core/memory_card.cpp index 550793f09..890253dc2 100644 --- a/src/core/memory_card.cpp +++ b/src/core/memory_card.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memory_card.h" #include "host.h" diff --git a/src/core/memory_card.h b/src/core/memory_card.h index 56ee7771d..63c376723 100644 --- a/src/core/memory_card.h +++ b/src/core/memory_card.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/memory_card_image.cpp b/src/core/memory_card_image.cpp index 0beedde81..6bbf60121 100644 --- a/src/core/memory_card_image.cpp +++ b/src/core/memory_card_image.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memory_card_image.h" #include "gpu_types.h" diff --git a/src/core/memory_card_image.h b/src/core/memory_card_image.h index 6a0398547..e9d014eb4 100644 --- a/src/core/memory_card_image.h +++ b/src/core/memory_card_image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/multitap.cpp b/src/core/multitap.cpp index 6ea5e4683..7b604a832 100644 --- a/src/core/multitap.cpp +++ b/src/core/multitap.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "multitap.h" #include "controller.h" diff --git a/src/core/multitap.h b/src/core/multitap.h index 040e47f45..b86b43fe9 100644 --- a/src/core/multitap.h +++ b/src/core/multitap.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/negcon.cpp b/src/core/negcon.cpp index 515fea317..59c8b5030 100644 --- a/src/core/negcon.cpp +++ b/src/core/negcon.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "negcon.h" #include "host.h" diff --git a/src/core/negcon.h b/src/core/negcon.h index 0b3e195a8..fa3bdeb75 100644 --- a/src/core/negcon.h +++ b/src/core/negcon.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/negcon_rumble.cpp b/src/core/negcon_rumble.cpp index a8c95e10c..42fc7343a 100644 --- a/src/core/negcon_rumble.cpp +++ b/src/core/negcon_rumble.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "negcon_rumble.h" #include "IconsFontAwesome5.h" diff --git a/src/core/negcon_rumble.h b/src/core/negcon_rumble.h index 32bfb32da..25706dc6e 100644 --- a/src/core/negcon_rumble.h +++ b/src/core/negcon_rumble.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/pad.cpp b/src/core/pad.cpp index 763ca4dd3..60635f203 100644 --- a/src/core/pad.cpp +++ b/src/core/pad.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "pad.h" #include "controller.h" diff --git a/src/core/pad.h b/src/core/pad.h index 45ba93ba0..31649aa9f 100644 --- a/src/core/pad.h +++ b/src/core/pad.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/pcdrv.cpp b/src/core/pcdrv.cpp index dd27a7d8e..32d57b952 100644 --- a/src/core/pcdrv.cpp +++ b/src/core/pcdrv.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "pcdrv.h" #include "cpu_core.h" diff --git a/src/core/pcdrv.h b/src/core/pcdrv.h index aca11424c..e42824f8f 100644 --- a/src/core/pcdrv.h +++ b/src/core/pcdrv.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/pch.cpp b/src/core/pch.cpp index ef4256aee..8543a442d 100644 --- a/src/core/pch.cpp +++ b/src/core/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "pch.h" diff --git a/src/core/pch.h b/src/core/pch.h index 325ed4db1..36af59bae 100644 --- a/src/core/pch.h +++ b/src/core/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/pine_server.cpp b/src/core/pine_server.cpp index 1d5720696..22de9d648 100644 --- a/src/core/pine_server.cpp +++ b/src/core/pine_server.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team, Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 +// // NOTE: File has been rewritten completely compared to the original, only the enums remain. +// #include "pine_server.h" #include "cpu_core.h" diff --git a/src/core/pine_server.h b/src/core/pine_server.h index c234b16eb..ae3e0a86d 100644 --- a/src/core/pine_server.h +++ b/src/core/pine_server.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team, Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // A reference client implementation for interfacing with PINE is available here: // https://code.govanify.com/govanify/pine/ diff --git a/src/core/playstation_mouse.cpp b/src/core/playstation_mouse.cpp index efde92c7e..b7fb5207f 100644 --- a/src/core/playstation_mouse.cpp +++ b/src/core/playstation_mouse.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "playstation_mouse.h" #include "gpu.h" diff --git a/src/core/playstation_mouse.h b/src/core/playstation_mouse.h index 2583d0c75..38c33cd95 100644 --- a/src/core/playstation_mouse.h +++ b/src/core/playstation_mouse.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/psf_loader.cpp b/src/core/psf_loader.cpp index c4fc37e60..451cd0024 100644 --- a/src/core/psf_loader.cpp +++ b/src/core/psf_loader.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "psf_loader.h" #include "bios.h" diff --git a/src/core/psf_loader.h b/src/core/psf_loader.h index 84e272140..a1bec4a9c 100644 --- a/src/core/psf_loader.h +++ b/src/core/psf_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/save_state_version.h b/src/core/save_state_version.h index 9f3c6cc37..1001d0345 100644 --- a/src/core/save_state_version.h +++ b/src/core/save_state_version.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/settings.cpp b/src/core/settings.cpp index db23ed84e..9aee8c8eb 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "settings.h" #include "achievements.h" @@ -203,7 +203,6 @@ void Settings::Load(SettingsInterface& si, SettingsInterface& controller_si) gpu_use_software_renderer_for_readbacks = si.GetBoolValue("GPU", "UseSoftwareRendererForReadbacks", false); gpu_threaded_presentation = si.GetBoolValue("GPU", "ThreadedPresentation", DEFAULT_THREADED_PRESENTATION); gpu_true_color = si.GetBoolValue("GPU", "TrueColor", true); - gpu_debanding = si.GetBoolValue("GPU", "Debanding", false); gpu_scaled_dithering = si.GetBoolValue("GPU", "ScaledDithering", true); gpu_force_round_texcoords = si.GetBoolValue("GPU", "ForceRoundTextureCoordinates", false); gpu_accurate_blending = si.GetBoolValue("GPU", "AccurateBlending", false); @@ -522,7 +521,6 @@ void Settings::Save(SettingsInterface& si, bool ignore_base) const si.SetBoolValue("GPU", "ThreadedPresentation", gpu_threaded_presentation); si.SetBoolValue("GPU", "UseSoftwareRendererForReadbacks", gpu_use_software_renderer_for_readbacks); si.SetBoolValue("GPU", "TrueColor", gpu_true_color); - si.SetBoolValue("GPU", "Debanding", gpu_debanding); si.SetBoolValue("GPU", "ScaledDithering", gpu_scaled_dithering); si.SetBoolValue("GPU", "ForceRoundTextureCoordinates", gpu_force_round_texcoords); si.SetBoolValue("GPU", "AccurateBlending", gpu_accurate_blending); @@ -737,7 +735,6 @@ void Settings::FixIncompatibleSettings(bool display_osd_messages) g_settings.gpu_multisamples = 1; g_settings.gpu_per_sample_shading = false; g_settings.gpu_true_color = false; - g_settings.gpu_debanding = false; g_settings.gpu_scaled_dithering = false; g_settings.gpu_force_round_texcoords = false; g_settings.gpu_texture_filter = GPUTextureFilter::Nearest; diff --git a/src/core/settings.h b/src/core/settings.h index 3a0390642..b7f840685 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once @@ -117,7 +117,6 @@ struct Settings bool gpu_disable_raster_order_views : 1 = false; bool gpu_per_sample_shading : 1 = false; bool gpu_true_color : 1 = true; - bool gpu_debanding : 1 = false; bool gpu_scaled_dithering : 1 = true; bool gpu_force_round_texcoords : 1 = false; bool gpu_accurate_blending : 1 = false; diff --git a/src/core/shader_cache_version.h b/src/core/shader_cache_version.h index f1c67d8da..d8afe45f0 100644 --- a/src/core/shader_cache_version.h +++ b/src/core/shader_cache_version.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/sio.cpp b/src/core/sio.cpp index 81e4ef7f7..b7f600ef7 100644 --- a/src/core/sio.cpp +++ b/src/core/sio.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "sio.h" #include "controller.h" diff --git a/src/core/sio.h b/src/core/sio.h index da35af248..7a53118a3 100644 --- a/src/core/sio.h +++ b/src/core/sio.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/spu.cpp b/src/core/spu.cpp index 0a9138203..f60424acb 100644 --- a/src/core/spu.cpp +++ b/src/core/spu.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "spu.h" #include "cdrom.h" diff --git a/src/core/spu.h b/src/core/spu.h index 46674e422..764425317 100644 --- a/src/core/spu.h +++ b/src/core/spu.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/system.cpp b/src/core/system.cpp index 525210887..6b3fb703a 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "system.h" #include "achievements.h" @@ -4296,7 +4296,6 @@ void System::CheckForSettingsChanges(const Settings& old_settings) g_settings.gpu_fifo_size != old_settings.gpu_fifo_size || g_settings.gpu_max_run_ahead != old_settings.gpu_max_run_ahead || g_settings.gpu_true_color != old_settings.gpu_true_color || - g_settings.gpu_debanding != old_settings.gpu_debanding || g_settings.gpu_scaled_dithering != old_settings.gpu_scaled_dithering || g_settings.gpu_force_round_texcoords != old_settings.gpu_force_round_texcoords || g_settings.gpu_accurate_blending != old_settings.gpu_accurate_blending || diff --git a/src/core/system.h b/src/core/system.h index 3a776dc0c..43084a36d 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/texture_replacements.cpp b/src/core/texture_replacements.cpp index 57fa07540..03f6dc566 100644 --- a/src/core/texture_replacements.cpp +++ b/src/core/texture_replacements.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "texture_replacements.h" #include "gpu_types.h" diff --git a/src/core/texture_replacements.h b/src/core/texture_replacements.h index 78e7f2d83..acac05a36 100644 --- a/src/core/texture_replacements.h +++ b/src/core/texture_replacements.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/timers.cpp b/src/core/timers.cpp index 3d85b54f5..a08a84719 100644 --- a/src/core/timers.cpp +++ b/src/core/timers.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "timers.h" #include "gpu.h" diff --git a/src/core/timers.h b/src/core/timers.h index 778c8e24b..3edf3a9d6 100644 --- a/src/core/timers.h +++ b/src/core/timers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp index caf980f1a..c5e826145 100644 --- a/src/core/timing_event.cpp +++ b/src/core/timing_event.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "timing_event.h" #include "cpu_core.h" diff --git a/src/core/timing_event.h b/src/core/timing_event.h index f3fe7d5e6..c481ad79a 100644 --- a/src/core/timing_event.h +++ b/src/core/timing_event.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/core/types.h b/src/core/types.h index e00902bd2..3ffa2e1ea 100644 --- a/src/core/types.h +++ b/src/core/types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/aboutdialog.cpp b/src/duckstation-qt/aboutdialog.cpp index 07c4620e7..6aab598d1 100644 --- a/src/duckstation-qt/aboutdialog.cpp +++ b/src/duckstation-qt/aboutdialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "aboutdialog.h" #include "qtutils.h" @@ -40,7 +40,7 @@ p, li { white-space: pre-wrap; }

Connor McLaughlin <stenzek@gmail.com>

and other contributors

%3 icons8

-

%4 | GitHub | Discord

+

%4 | GitHub | Discord

)") .arg(tr("DuckStation is a free and open-source simulator/emulator of the Sony " "PlayStationTM console, focusing on " diff --git a/src/duckstation-qt/aboutdialog.h b/src/duckstation-qt/aboutdialog.h index e79d51220..4247c3455 100644 --- a/src/duckstation-qt/aboutdialog.h +++ b/src/duckstation-qt/aboutdialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index f79b4234d..e5bd46a6a 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "achievementlogindialog.h" #include "qthost.h" diff --git a/src/duckstation-qt/achievementlogindialog.h b/src/duckstation-qt/achievementlogindialog.h index 2e63a0abc..83b1b93c3 100644 --- a/src/duckstation-qt/achievementlogindialog.h +++ b/src/duckstation-qt/achievementlogindialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "ui_achievementlogindialog.h" diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index b4a75c93d..f4ca12fee 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "achievementsettingswidget.h" #include "achievementlogindialog.h" diff --git a/src/duckstation-qt/achievementsettingswidget.h b/src/duckstation-qt/achievementsettingswidget.h index 3d91f2094..9e6affe2b 100644 --- a/src/duckstation-qt/achievementsettingswidget.h +++ b/src/duckstation-qt/achievementsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include diff --git a/src/duckstation-qt/advancedsettingswidget.cpp b/src/duckstation-qt/advancedsettingswidget.cpp index c457b2f96..72faac35a 100644 --- a/src/duckstation-qt/advancedsettingswidget.cpp +++ b/src/duckstation-qt/advancedsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "advancedsettingswidget.h" #include "core/gpu_types.h" diff --git a/src/duckstation-qt/advancedsettingswidget.h b/src/duckstation-qt/advancedsettingswidget.h index f30d79275..ab51eda31 100644 --- a/src/duckstation-qt/advancedsettingswidget.h +++ b/src/duckstation-qt/advancedsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp index d068cc6d7..82622abb6 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "audiosettingswidget.h" #include "qtutils.h" diff --git a/src/duckstation-qt/audiosettingswidget.h b/src/duckstation-qt/audiosettingswidget.h index 816a895cd..a3b804b01 100644 --- a/src/duckstation-qt/audiosettingswidget.h +++ b/src/duckstation-qt/audiosettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/autoupdaterdialog.cpp b/src/duckstation-qt/autoupdaterdialog.cpp index 5c0e7fff0..9107a3a47 100644 --- a/src/duckstation-qt/autoupdaterdialog.cpp +++ b/src/duckstation-qt/autoupdaterdialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "autoupdaterdialog.h" #include "mainwindow.h" @@ -118,21 +118,22 @@ bool AutoUpdaterDialog::warnAboutUnofficialBuild() // // To those distributing their own builds or packages of DuckStation, and seeing this message: // - // This message is here for a reason. Under the terms of the license, you are within your rights to distribute your - // own builds of my application. However, it is a headache for me, as users run into broken functionality, or end up - // on untested/preview commits that have not been adequately tested, and I cannot resolve their issues. I provide - // builds for a range of platforms that covers almost all use cases, and can guarantee quality of these builds. + // DuckStation is licensed under the CC-BY-NC-ND-4.0 license. // - // If you must distribute builds/packages, per the GPL, modified builds should be clearly marked as such. - // This message is thus one way of meeting the requirement. See Section 5 of the GPLv3: - // https://www.gnu.org/licenses/gpl-3.0.en.html#section5 + // This means that you do NOT have permission to re-distribute your own modified builds of DuckStation. + // Modifying DuckStation for personal use is fine, but you cannot distribute builds with your changes. + // As per the CC-BY-NC-ND conditions, you can re-distribute the official builds from https://www.duckstation.org/ and + // https://github.com/stenzek/duckstation, so long as they are left intact, without modification. I welcome and + // appreciate any pull requests made to the official repository at https://github.com/stenzek/duckstation. // - // This includes building the binary with any method that does not match the official release, including dependencies, - // as it is not uncommon for differing dependency versions to create issues I cannot reproduce. + // I made the decision to switch to a no-derivatives license because of numerous "forks" that were created purely for + // generating money for the person who knocked it off, and always died, leaving the community with multiple builds to + // choose from, most of which were out of date and broken, and endless confusion. Other forks copy/pasted upstream + // changes without attribution, violating copyright. // - // You should also provide user support for your package, and not direct them to upstream, as any users that ask for - // community help will be instructed to download a supported release instead. + // Thanks, and I hope you understand. // + #if !__has_include("scmversion/tag.h") && !defined(_DEBUG) constexpr const char* CONFIG_SECTION = "UI"; constexpr const char* CONFIG_KEY = "UnofficialBuildWarningConfirmed"; @@ -141,12 +142,13 @@ bool AutoUpdaterDialog::warnAboutUnofficialBuild() constexpr int DELAY_SECONDS = 5; - const QString message = QStringLiteral( - "

You are not using an official release!

If you continue to use this build, expect to run into " - "issues.

No assistance will be provided by the developers or community, as we cannot fix " - "broken functionality in builds we do not control.

We strongly recommend downloading an " - "official release from duckstation.org.

Do you want to exit and " - "open this page now?

"); + const QString message = + QStringLiteral("

You are not using an official release!

DuckStation is licensed under the terms of " + "CC-BY-NC-ND-4.0, which does not allow modified builds to be distributed.

" + "

If you are a developer and using a local build, you can check the box below and continue.

" + "

Otherwise, you should delete this build and download an official release from " + "duckstation.org.

Do you want to exit and " + "open this page now?

"); QMessageBox mbox; mbox.setIcon(QMessageBox::Warning); diff --git a/src/duckstation-qt/autoupdaterdialog.h b/src/duckstation-qt/autoupdaterdialog.h index 1da1b90ef..713f0e84e 100644 --- a/src/duckstation-qt/autoupdaterdialog.h +++ b/src/duckstation-qt/autoupdaterdialog.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/biossettingswidget.cpp b/src/duckstation-qt/biossettingswidget.cpp index 6324ecad3..e5f0db883 100644 --- a/src/duckstation-qt/biossettingswidget.cpp +++ b/src/duckstation-qt/biossettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "biossettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/biossettingswidget.h b/src/duckstation-qt/biossettingswidget.h index 66c7d1814..3ee9cc7d7 100644 --- a/src/duckstation-qt/biossettingswidget.h +++ b/src/duckstation-qt/biossettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "core/types.h" diff --git a/src/duckstation-qt/cheatcodeeditordialog.cpp b/src/duckstation-qt/cheatcodeeditordialog.cpp index a8c698d5e..0516f327c 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.cpp +++ b/src/duckstation-qt/cheatcodeeditordialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cheatcodeeditordialog.h" #include diff --git a/src/duckstation-qt/cheatcodeeditordialog.h b/src/duckstation-qt/cheatcodeeditordialog.h index bfbc9025a..954f6b878 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.h +++ b/src/duckstation-qt/cheatcodeeditordialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "core/cheats.h" diff --git a/src/duckstation-qt/cheatmanagerwindow.cpp b/src/duckstation-qt/cheatmanagerwindow.cpp index 21f40062a..122c98b60 100644 --- a/src/duckstation-qt/cheatmanagerwindow.cpp +++ b/src/duckstation-qt/cheatmanagerwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cheatmanagerwindow.h" #include "cheatcodeeditordialog.h" diff --git a/src/duckstation-qt/cheatmanagerwindow.h b/src/duckstation-qt/cheatmanagerwindow.h index f82d3698d..a50f8fb1e 100644 --- a/src/duckstation-qt/cheatmanagerwindow.h +++ b/src/duckstation-qt/cheatmanagerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/colorpickerbutton.cpp b/src/duckstation-qt/colorpickerbutton.cpp index 5bb59030c..04e1d0c30 100644 --- a/src/duckstation-qt/colorpickerbutton.cpp +++ b/src/duckstation-qt/colorpickerbutton.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "colorpickerbutton.h" #include "qtutils.h" diff --git a/src/duckstation-qt/colorpickerbutton.h b/src/duckstation-qt/colorpickerbutton.h index c15908301..a9829e659 100644 --- a/src/duckstation-qt/colorpickerbutton.h +++ b/src/duckstation-qt/colorpickerbutton.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/consolesettingswidget.cpp b/src/duckstation-qt/consolesettingswidget.cpp index 19ac11cfd..f3a014ba2 100644 --- a/src/duckstation-qt/consolesettingswidget.cpp +++ b/src/duckstation-qt/consolesettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "consolesettingswidget.h" #include "qtutils.h" diff --git a/src/duckstation-qt/consolesettingswidget.h b/src/duckstation-qt/consolesettingswidget.h index 1c4161306..3edca7303 100644 --- a/src/duckstation-qt/consolesettingswidget.h +++ b/src/duckstation-qt/consolesettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp index bffca6bce..68d3531a3 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "controllerbindingwidgets.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/controllerbindingwidgets.h b/src/duckstation-qt/controllerbindingwidgets.h index 48dff0a19..012f55312 100644 --- a/src/duckstation-qt/controllerbindingwidgets.h +++ b/src/duckstation-qt/controllerbindingwidgets.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/controllerglobalsettingswidget.cpp b/src/duckstation-qt/controllerglobalsettingswidget.cpp index 0d64005de..5a2d33a26 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.cpp +++ b/src/duckstation-qt/controllerglobalsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "controllerglobalsettingswidget.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/controllerglobalsettingswidget.h b/src/duckstation-qt/controllerglobalsettingswidget.h index b229db212..e007a882b 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.h +++ b/src/duckstation-qt/controllerglobalsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/controllersettingswindow.cpp b/src/duckstation-qt/controllersettingswindow.cpp index 3da41c4d2..aafda3847 100644 --- a/src/duckstation-qt/controllersettingswindow.cpp +++ b/src/duckstation-qt/controllersettingswindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "controllersettingswindow.h" #include "controllerbindingwidgets.h" diff --git a/src/duckstation-qt/controllersettingswindow.h b/src/duckstation-qt/controllersettingswindow.h index 7f080d627..470185dc3 100644 --- a/src/duckstation-qt/controllersettingswindow.h +++ b/src/duckstation-qt/controllersettingswindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/controllersettingwidgetbinder.h b/src/duckstation-qt/controllersettingwidgetbinder.h index 4f3f328f9..e1a217d85 100644 --- a/src/duckstation-qt/controllersettingwidgetbinder.h +++ b/src/duckstation-qt/controllersettingwidgetbinder.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/coverdownloaddialog.cpp b/src/duckstation-qt/coverdownloaddialog.cpp index 010f3159f..790dd7abf 100644 --- a/src/duckstation-qt/coverdownloaddialog.cpp +++ b/src/duckstation-qt/coverdownloaddialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "coverdownloaddialog.h" #include "qthost.h" diff --git a/src/duckstation-qt/coverdownloaddialog.h b/src/duckstation-qt/coverdownloaddialog.h index 18f88a5ba..2174287bd 100644 --- a/src/duckstation-qt/coverdownloaddialog.h +++ b/src/duckstation-qt/coverdownloaddialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/timer.h" diff --git a/src/duckstation-qt/debuggermodels.cpp b/src/duckstation-qt/debuggermodels.cpp index eff69bd2e..b2a029039 100644 --- a/src/duckstation-qt/debuggermodels.cpp +++ b/src/duckstation-qt/debuggermodels.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "debuggermodels.h" diff --git a/src/duckstation-qt/debuggermodels.h b/src/duckstation-qt/debuggermodels.h index 1d0e0c93c..244df41b8 100644 --- a/src/duckstation-qt/debuggermodels.h +++ b/src/duckstation-qt/debuggermodels.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/debuggerwindow.cpp b/src/duckstation-qt/debuggerwindow.cpp index 153c3422d..03d06d41f 100644 --- a/src/duckstation-qt/debuggerwindow.cpp +++ b/src/duckstation-qt/debuggerwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "debuggerwindow.h" #include "debuggermodels.h" diff --git a/src/duckstation-qt/debuggerwindow.h b/src/duckstation-qt/debuggerwindow.h index 83816f45c..31525fff6 100644 --- a/src/duckstation-qt/debuggerwindow.h +++ b/src/duckstation-qt/debuggerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/displaywidget.cpp b/src/duckstation-qt/displaywidget.cpp index 91adb2a1d..c300e3da1 100644 --- a/src/duckstation-qt/displaywidget.cpp +++ b/src/duckstation-qt/displaywidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "displaywidget.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/displaywidget.h b/src/duckstation-qt/displaywidget.h index be357fe9b..62635df79 100644 --- a/src/duckstation-qt/displaywidget.h +++ b/src/duckstation-qt/displaywidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp index 8d98e412f..32a829b0f 100644 --- a/src/duckstation-qt/emulationsettingswidget.cpp +++ b/src/duckstation-qt/emulationsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "emulationsettingswidget.h" #include "core/system.h" diff --git a/src/duckstation-qt/emulationsettingswidget.h b/src/duckstation-qt/emulationsettingswidget.h index 2eab3df4a..f6ecca436 100644 --- a/src/duckstation-qt/emulationsettingswidget.h +++ b/src/duckstation-qt/emulationsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/foldersettingswidget.cpp b/src/duckstation-qt/foldersettingswidget.cpp index 803e7c39c..9a2466766 100644 --- a/src/duckstation-qt/foldersettingswidget.cpp +++ b/src/duckstation-qt/foldersettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include #include diff --git a/src/duckstation-qt/foldersettingswidget.h b/src/duckstation-qt/foldersettingswidget.h index 8c2a68483..2bbd85bb1 100644 --- a/src/duckstation-qt/foldersettingswidget.h +++ b/src/duckstation-qt/foldersettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/gamelistmodel.cpp b/src/duckstation-qt/gamelistmodel.cpp index 99bd8f613..6b78ff536 100644 --- a/src/duckstation-qt/gamelistmodel.cpp +++ b/src/duckstation-qt/gamelistmodel.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gamelistmodel.h" #include "qthost.h" diff --git a/src/duckstation-qt/gamelistmodel.h b/src/duckstation-qt/gamelistmodel.h index c156f6f30..4ebabfd9c 100644 --- a/src/duckstation-qt/gamelistmodel.h +++ b/src/duckstation-qt/gamelistmodel.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/gamelistrefreshthread.cpp b/src/duckstation-qt/gamelistrefreshthread.cpp index d493e2ebf..bd2c4d376 100644 --- a/src/duckstation-qt/gamelistrefreshthread.cpp +++ b/src/duckstation-qt/gamelistrefreshthread.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gamelistrefreshthread.h" #include "qtutils.h" diff --git a/src/duckstation-qt/gamelistrefreshthread.h b/src/duckstation-qt/gamelistrefreshthread.h index d2a409ffc..5fb61a41f 100644 --- a/src/duckstation-qt/gamelistrefreshthread.h +++ b/src/duckstation-qt/gamelistrefreshthread.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/gamelistsettingswidget.cpp b/src/duckstation-qt/gamelistsettingswidget.cpp index f38132e31..38cb0e1c2 100644 --- a/src/duckstation-qt/gamelistsettingswidget.cpp +++ b/src/duckstation-qt/gamelistsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gamelistsettingswidget.h" #include "core/game_list.h" diff --git a/src/duckstation-qt/gamelistsettingswidget.h b/src/duckstation-qt/gamelistsettingswidget.h index 1427c3a7b..e7a4b21ca 100644 --- a/src/duckstation-qt/gamelistsettingswidget.h +++ b/src/duckstation-qt/gamelistsettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp index ca907cb05..0162fdaee 100644 --- a/src/duckstation-qt/gamelistwidget.cpp +++ b/src/duckstation-qt/gamelistwidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gamelistwidget.h" #include "gamelistmodel.h" diff --git a/src/duckstation-qt/gamelistwidget.h b/src/duckstation-qt/gamelistwidget.h index b3e325b26..758181e72 100644 --- a/src/duckstation-qt/gamelistwidget.h +++ b/src/duckstation-qt/gamelistwidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "ui_emptygamelistwidget.h" diff --git a/src/duckstation-qt/gamesummarywidget.cpp b/src/duckstation-qt/gamesummarywidget.cpp index aafb92ebb..62f3a90c1 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gamesummarywidget.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/gamesummarywidget.h b/src/duckstation-qt/gamesummarywidget.h index b27526f05..5c221152c 100644 --- a/src/duckstation-qt/gamesummarywidget.h +++ b/src/duckstation-qt/gamesummarywidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index f3c585191..c556bfbf9 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "graphicssettingswidget.h" #include "qtutils.h" @@ -137,7 +137,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.gpuWireframeMode, "GPU", "WireframeMode", Settings::ParseGPUWireframeMode, Settings::GetGPUWireframeModeName, Settings::DEFAULT_GPU_WIREFRAME_MODE); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.debanding, "GPU", "Debanding", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.scaledDithering, "GPU", "ScaledDithering", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.useSoftwareRendererForReadbacks, "GPU", "UseSoftwareRendererForReadbacks", false); @@ -309,8 +308,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* m_ui.textureFiltering, tr("Texture Filtering"), QString::fromUtf8(Settings::GetTextureFilterDisplayName(Settings::DEFAULT_GPU_TEXTURE_FILTER)), tr("Smooths out the blockiness of magnified textures on 3D objects by using filtering.
Will have a " - "greater effect on higher resolution scales.
The JINC2 and especially xBR filtering modes are very " - "demanding, and may not be worth the speed penalty.")); + "greater effect on higher resolution scales.")); dialog->registerWidgetHelp( m_ui.spriteTextureFiltering, tr("Sprite Texture Filtering"), QString::fromUtf8(Settings::GetTextureFilterDisplayName(Settings::DEFAULT_GPU_TEXTURE_FILTER)), @@ -410,12 +408,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* m_ui.msaaMode, tr("Multi-Sampling"), tr("Disabled"), tr("Uses multi-sampled anti-aliasing when rendering 3D polygons. Can improve visuals with a lower performance " "requirement compared to upscaling, but often introduces rendering errors.")); - dialog->registerWidgetHelp( - m_ui.debanding, tr("True Color Debanding"), tr("Unchecked"), - tr("Applies modern dithering techniques to further smooth out gradients when true color is enabled. " - "This debanding is performed during rendering (as opposed to a post-processing step), which allows it to be " - "fast while preserving detail. " - "Debanding increases the file size of screenshots due to the subtle dithering pattern present in screenshots.")); dialog->registerWidgetHelp( m_ui.scaledDithering, tr("Scaled Dithering"), tr("Checked"), tr("Scales the dither pattern to the resolution scale of the emulated GPU. This makes the dither pattern much less " @@ -485,9 +477,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* tr("Shows the internal frame rate of the game in the top-right corner of the display.")); dialog->registerWidgetHelp( m_ui.showCPU, tr("Show CPU Usage"), tr("Unchecked"), - tr("Shows the host's CPU usage based on threads in the top-right corner of the display. This does not display the " - "emulated system CPU's usage. If a value close to 100% is being displayed, this means your host's CPU is likely " - "the bottleneck. In this case, you should reduce enhancement-related settings such as overclocking.")); + tr("Shows the host's CPU usage of each system thread in the top-right corner of the display.")); dialog->registerWidgetHelp(m_ui.showGPU, tr("Show GPU Usage"), tr("Unchecked"), tr("Shows the host's GPU usage in the top-right corner of the display.")); dialog->registerWidgetHelp(m_ui.showGPUStatistics, tr("Show GPU Statistics"), tr("Unchecked"), @@ -762,7 +752,6 @@ void GraphicsSettingsWidget::updateRendererDependentOptions() m_ui.gpuLineDetectModeLabel->setEnabled(is_hardware); m_ui.gpuWireframeMode->setEnabled(is_hardware); m_ui.gpuWireframeModeLabel->setEnabled(is_hardware); - m_ui.debanding->setEnabled(is_hardware); m_ui.scaledDithering->setEnabled(is_hardware && !m_dialog->hasGameTrait(GameDatabase::Trait::DisableScaledDithering)); m_ui.useSoftwareRendererForReadbacks->setEnabled(is_hardware); m_ui.forceRoundedTexcoords->setEnabled(is_hardware); @@ -980,7 +969,6 @@ void GraphicsSettingsWidget::onTrueColorChanged() const bool allow_scaled_dithering = (resolution_scale != 1 && !true_color && !m_dialog->hasGameTrait(GameDatabase::Trait::DisableScaledDithering)); m_ui.scaledDithering->setEnabled(allow_scaled_dithering); - m_ui.debanding->setEnabled(true_color); m_ui.accurateBlending->setEnabled(!true_color); } diff --git a/src/duckstation-qt/graphicssettingswidget.h b/src/duckstation-qt/graphicssettingswidget.h index 361ecd109..6752ac2f1 100644 --- a/src/duckstation-qt/graphicssettingswidget.h +++ b/src/duckstation-qt/graphicssettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/graphicssettingswidget.ui b/src/duckstation-qt/graphicssettingswidget.ui index 4da2d9be4..a0f0f2a4e 100644 --- a/src/duckstation-qt/graphicssettingswidget.ui +++ b/src/duckstation-qt/graphicssettingswidget.ui @@ -387,6 +387,16 @@ Rendering Options + + + + Multi-Sampling: + + + + + + @@ -399,6 +409,13 @@ + + + + Threaded Rendering + + + @@ -406,53 +423,29 @@ - - - - True Color Debanding - - - - - - - Software Renderer Readbacks - - - - + Round Upscaled Texture Coordinates - - - - Threaded Rendering - - - - + Accurate Blending + + + + Software Renderer Readbacks + + + - - - - Multi-Sampling: - - - - - - diff --git a/src/duckstation-qt/hotkeysettingswidget.cpp b/src/duckstation-qt/hotkeysettingswidget.cpp index f71b8509a..2b4f832d2 100644 --- a/src/duckstation-qt/hotkeysettingswidget.cpp +++ b/src/duckstation-qt/hotkeysettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "hotkeysettingswidget.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/hotkeysettingswidget.h b/src/duckstation-qt/hotkeysettingswidget.h index 864a1fab9..3e54e2c82 100644 --- a/src/duckstation-qt/hotkeysettingswidget.h +++ b/src/duckstation-qt/hotkeysettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/inputbindingdialog.cpp b/src/duckstation-qt/inputbindingdialog.cpp index 5cc3a20cc..412953b3e 100644 --- a/src/duckstation-qt/inputbindingdialog.cpp +++ b/src/duckstation-qt/inputbindingdialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "inputbindingdialog.h" #include "controllersettingwidgetbinder.h" diff --git a/src/duckstation-qt/inputbindingdialog.h b/src/duckstation-qt/inputbindingdialog.h index 2796ebf6f..940dccf73 100644 --- a/src/duckstation-qt/inputbindingdialog.h +++ b/src/duckstation-qt/inputbindingdialog.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/inputbindingwidgets.cpp b/src/duckstation-qt/inputbindingwidgets.cpp index ec3b543a1..e4b96ec48 100644 --- a/src/duckstation-qt/inputbindingwidgets.cpp +++ b/src/duckstation-qt/inputbindingwidgets.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "inputbindingwidgets.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/inputbindingwidgets.h b/src/duckstation-qt/inputbindingwidgets.h index 087e0c195..8339de5e4 100644 --- a/src/duckstation-qt/inputbindingwidgets.h +++ b/src/duckstation-qt/inputbindingwidgets.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/interfacesettingswidget.cpp b/src/duckstation-qt/interfacesettingswidget.cpp index b0f394fb4..12f494be0 100644 --- a/src/duckstation-qt/interfacesettingswidget.cpp +++ b/src/duckstation-qt/interfacesettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "interfacesettingswidget.h" #include "autoupdaterdialog.h" diff --git a/src/duckstation-qt/interfacesettingswidget.h b/src/duckstation-qt/interfacesettingswidget.h index 0be63cea6..35d66335b 100644 --- a/src/duckstation-qt/interfacesettingswidget.h +++ b/src/duckstation-qt/interfacesettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/logwindow.cpp b/src/duckstation-qt/logwindow.cpp index b405cf722..3ee828005 100644 --- a/src/duckstation-qt/logwindow.cpp +++ b/src/duckstation-qt/logwindow.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "logwindow.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/logwindow.h b/src/duckstation-qt/logwindow.h index d6054d940..bf14dd56f 100644 --- a/src/duckstation-qt/logwindow.h +++ b/src/duckstation-qt/logwindow.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index 7cbfd26bb..f35230e4c 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "mainwindow.h" #include "aboutdialog.h" diff --git a/src/duckstation-qt/mainwindow.h b/src/duckstation-qt/mainwindow.h index fba4d7e36..3332fd11a 100644 --- a/src/duckstation-qt/mainwindow.h +++ b/src/duckstation-qt/mainwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/memorycardeditorwindow.cpp b/src/duckstation-qt/memorycardeditorwindow.cpp index 6908489ee..6e99d787c 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memorycardeditorwindow.h" #include "qtutils.h" diff --git a/src/duckstation-qt/memorycardeditorwindow.h b/src/duckstation-qt/memorycardeditorwindow.h index eeacf63e9..1964bb97b 100644 --- a/src/duckstation-qt/memorycardeditorwindow.h +++ b/src/duckstation-qt/memorycardeditorwindow.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/memorycardsettingswidget.cpp b/src/duckstation-qt/memorycardsettingswidget.cpp index ce5d49c99..ccaf5a6ed 100644 --- a/src/duckstation-qt/memorycardsettingswidget.cpp +++ b/src/duckstation-qt/memorycardsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memorycardsettingswidget.h" diff --git a/src/duckstation-qt/memorycardsettingswidget.h b/src/duckstation-qt/memorycardsettingswidget.h index 6edddf597..4426fc0df 100644 --- a/src/duckstation-qt/memorycardsettingswidget.h +++ b/src/duckstation-qt/memorycardsettingswidget.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once + #include "core/types.h" #include diff --git a/src/duckstation-qt/memoryscannerwindow.cpp b/src/duckstation-qt/memoryscannerwindow.cpp index 45d66e6f0..4077519c6 100644 --- a/src/duckstation-qt/memoryscannerwindow.cpp +++ b/src/duckstation-qt/memoryscannerwindow.cpp @@ -1,16 +1,19 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "memoryscannerwindow.h" #include "cheatcodeeditordialog.h" -#include "common/assert.h" -#include "common/string_util.h" +#include "qthost.h" +#include "qtutils.h" + #include "core/bus.h" #include "core/cpu_core.h" #include "core/host.h" #include "core/system.h" -#include "qthost.h" -#include "qtutils.h" + +#include "common/assert.h" +#include "common/string_util.h" + #include #include #include @@ -91,7 +94,8 @@ MemoryScannerWindow::MemoryScannerWindow() : QWidget() m_ui.setupUi(this); connectUi(); - m_ui.cheatEngineAddress->setText(tr("Address of RAM for HxD Usage: 0x%1").arg(reinterpret_cast(Bus::g_unprotected_ram), 16, 16, QChar('0'))); + m_ui.cheatEngineAddress->setText(tr("Address of RAM for HxD Usage: 0x%1") + .arg(reinterpret_cast(Bus::g_unprotected_ram), 16, 16, QChar('0'))); } MemoryScannerWindow::~MemoryScannerWindow() = default; diff --git a/src/duckstation-qt/memoryscannerwindow.h b/src/duckstation-qt/memoryscannerwindow.h index 282ff70f2..df941746b 100644 --- a/src/duckstation-qt/memoryscannerwindow.h +++ b/src/duckstation-qt/memoryscannerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/pch.cpp b/src/duckstation-qt/pch.cpp index ef4256aee..8543a442d 100644 --- a/src/duckstation-qt/pch.cpp +++ b/src/duckstation-qt/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "pch.h" diff --git a/src/duckstation-qt/pch.h b/src/duckstation-qt/pch.h index 9a5294ade..8220c1c72 100644 --- a/src/duckstation-qt/pch.h +++ b/src/duckstation-qt/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/postprocessingsettingswidget.cpp b/src/duckstation-qt/postprocessingsettingswidget.cpp index 6ee7b0b9a..3abc26446 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.cpp +++ b/src/duckstation-qt/postprocessingsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "postprocessingsettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/postprocessingsettingswidget.h b/src/duckstation-qt/postprocessingsettingswidget.h index d20ad48d2..f648ca63a 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.h +++ b/src/duckstation-qt/postprocessingsettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp index 83bd51aff..1ca11696b 100644 --- a/src/duckstation-qt/qthost.cpp +++ b/src/duckstation-qt/qthost.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "qthost.h" #include "autoupdaterdialog.h" diff --git a/src/duckstation-qt/qthost.h b/src/duckstation-qt/qthost.h index 6648c67cf..7c72db7be 100644 --- a/src/duckstation-qt/qthost.h +++ b/src/duckstation-qt/qthost.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/qtkeycodes.cpp b/src/duckstation-qt/qtkeycodes.cpp index 76871f7ad..b8884d1d9 100644 --- a/src/duckstation-qt/qtkeycodes.cpp +++ b/src/duckstation-qt/qtkeycodes.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "qtutils.h" diff --git a/src/duckstation-qt/qtprogresscallback.cpp b/src/duckstation-qt/qtprogresscallback.cpp index 18fe69844..cd7b4c1f4 100644 --- a/src/duckstation-qt/qtprogresscallback.cpp +++ b/src/duckstation-qt/qtprogresscallback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "qtprogresscallback.h" #include "qtutils.h" diff --git a/src/duckstation-qt/qtprogresscallback.h b/src/duckstation-qt/qtprogresscallback.h index 1733622d2..997a1e3aa 100644 --- a/src/duckstation-qt/qtprogresscallback.h +++ b/src/duckstation-qt/qtprogresscallback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/qtthemes.cpp b/src/duckstation-qt/qtthemes.cpp index 8d5c3a281..4ec431ea4 100644 --- a/src/duckstation-qt/qtthemes.cpp +++ b/src/duckstation-qt/qtthemes.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "interfacesettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/qttranslations.cpp b/src/duckstation-qt/qttranslations.cpp index 50ad0c376..25865892a 100644 --- a/src/duckstation-qt/qttranslations.cpp +++ b/src/duckstation-qt/qttranslations.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "mainwindow.h" #include "qthost.h" diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp index 74df8b86f..9c23197b6 100644 --- a/src/duckstation-qt/qtutils.cpp +++ b/src/duckstation-qt/qtutils.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "qtutils.h" diff --git a/src/duckstation-qt/qtutils.h b/src/duckstation-qt/qtutils.h index 2b6bb16f6..64cf85d94 100644 --- a/src/duckstation-qt/qtutils.h +++ b/src/duckstation-qt/qtutils.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/selectdiscdialog.cpp b/src/duckstation-qt/selectdiscdialog.cpp index 61276303e..e9fee2a99 100644 --- a/src/duckstation-qt/selectdiscdialog.cpp +++ b/src/duckstation-qt/selectdiscdialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "selectdiscdialog.h" #include "qtutils.h" diff --git a/src/duckstation-qt/selectdiscdialog.h b/src/duckstation-qt/selectdiscdialog.h index 36dc88317..ac1a271e3 100644 --- a/src/duckstation-qt/selectdiscdialog.h +++ b/src/duckstation-qt/selectdiscdialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/timer.h" diff --git a/src/duckstation-qt/settingswindow.cpp b/src/duckstation-qt/settingswindow.cpp index 67a7eb90d..16c152c44 100644 --- a/src/duckstation-qt/settingswindow.cpp +++ b/src/duckstation-qt/settingswindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "settingswindow.h" #include "advancedsettingswidget.h" @@ -122,7 +122,9 @@ void SettingsWindow::addPages() m_post_processing_settings = new PostProcessingSettingsWidget(this, m_ui.settingsContainer), tr("Post-Processing"), QStringLiteral("sun-fill"), tr("Post-Processing Settings
Post processing allows you to alter the appearance of the image " - "displayed on the screen with various filters. Shaders will be executed in sequence.")); + "displayed on the screen with various filters. Shaders will be executed in sequence. Additional shaders can be " + "downloaded from %1.") + .arg("https://github.com/duckstation/shaders")); addWidget( m_audio_settings = new AudioSettingsWidget(this, m_ui.settingsContainer), tr("Audio"), QStringLiteral("volume-up-line"), @@ -209,6 +211,7 @@ void SettingsWindow::connectUi() m_ui.settingsCategory->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); m_ui.settingsCategory->setCurrentRow(0); m_ui.settingsContainer->setCurrentIndex(0); + m_ui.helpText->setOpenExternalLinks(true); m_ui.helpText->setText(m_category_help_text[0]); connect(m_ui.settingsCategory, &QListWidget::currentRowChanged, this, &SettingsWindow::onCategoryCurrentRowChanged); connect(m_ui.close, &QPushButton::clicked, this, &SettingsWindow::close); diff --git a/src/duckstation-qt/settingswindow.h b/src/duckstation-qt/settingswindow.h index d6ef46066..9414abaa1 100644 --- a/src/duckstation-qt/settingswindow.h +++ b/src/duckstation-qt/settingswindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "ui_settingswindow.h" diff --git a/src/duckstation-qt/settingswindow.ui b/src/duckstation-qt/settingswindow.ui index 6f7f1e061..1478fd80b 100644 --- a/src/duckstation-qt/settingswindow.ui +++ b/src/duckstation-qt/settingswindow.ui @@ -20,7 +20,7 @@ DuckStation Settings - + :/icons/duck.png:/icons/duck.png @@ -62,25 +62,6 @@ - - - - - 0 - 100 - - - - - 16777215 - 100 - - - - true - - - @@ -107,7 +88,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -126,10 +107,32 @@ + + + + + 0 + 100 + + + + + 16777215 + 100 + + + + true + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + - + diff --git a/src/duckstation-qt/settingwidgetbinder.h b/src/duckstation-qt/settingwidgetbinder.h index 18a426f69..56b040fa0 100644 --- a/src/duckstation-qt/settingwidgetbinder.h +++ b/src/duckstation-qt/settingwidgetbinder.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/setupwizarddialog.cpp b/src/duckstation-qt/setupwizarddialog.cpp index fb8e5e441..7ed3dd344 100644 --- a/src/duckstation-qt/setupwizarddialog.cpp +++ b/src/duckstation-qt/setupwizarddialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "setupwizarddialog.h" #include "controllersettingwidgetbinder.h" diff --git a/src/duckstation-qt/setupwizarddialog.h b/src/duckstation-qt/setupwizarddialog.h index ad5bad941..677012d18 100644 --- a/src/duckstation-qt/setupwizarddialog.h +++ b/src/duckstation-qt/setupwizarddialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/duckstation-qt/vcruntimecheck.cpp b/src/duckstation-qt/vcruntimecheck.cpp index 501782068..fc3debea9 100644 --- a/src/duckstation-qt/vcruntimecheck.cpp +++ b/src/duckstation-qt/vcruntimecheck.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "common/windows_headers.h" #include diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp index fb64d24d2..58096bb4e 100644 --- a/src/duckstation-regtest/regtest_host.cpp +++ b/src/duckstation-regtest/regtest_host.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "core/achievements.h" #include "core/controller.h" diff --git a/src/scmversion/scmversion.h b/src/scmversion/scmversion.h index f84db2654..43001192a 100644 --- a/src/scmversion/scmversion.h +++ b/src/scmversion/scmversion.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/updater/Info.plist.in b/src/updater/Info.plist.in index 3e0a98227..b7d6ca081 100644 --- a/src/updater/Info.plist.in +++ b/src/updater/Info.plist.in @@ -13,7 +13,7 @@ CFBundlePackageType APPL NSHumanReadableCopyright - Licensed under GPL version 3 + 2019-2024 Connor McLaughlin <stenzek@gmail.com> LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHighResolutionCapable diff --git a/src/updater/cocoa_main.mm b/src/updater/cocoa_main.mm index 5df36a6c8..d259cd56e 100644 --- a/src/updater/cocoa_main.mm +++ b/src/updater/cocoa_main.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cocoa_progress_callback.h" #include "updater.h" diff --git a/src/updater/cocoa_progress_callback.h b/src/updater/cocoa_progress_callback.h index 8acf054a3..2d54ee76e 100644 --- a/src/updater/cocoa_progress_callback.h +++ b/src/updater/cocoa_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/updater/cocoa_progress_callback.mm b/src/updater/cocoa_progress_callback.mm index 207d0caeb..dadb3d248 100644 --- a/src/updater/cocoa_progress_callback.mm +++ b/src/updater/cocoa_progress_callback.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cocoa_progress_callback.h" diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp index 2501f9ead..e2350fe50 100644 --- a/src/updater/updater.cpp +++ b/src/updater/updater.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "updater.h" diff --git a/src/updater/updater.h b/src/updater/updater.h index 6cf39d9d9..e88e28d06 100644 --- a/src/updater/updater.h +++ b/src/updater/updater.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/progress_callback.h" diff --git a/src/updater/win32_main.cpp b/src/updater/win32_main.cpp index 08728d97f..e4a8c8907 100644 --- a/src/updater/win32_main.cpp +++ b/src/updater/win32_main.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "updater.h" #include "win32_progress_callback.h" diff --git a/src/updater/win32_progress_callback.cpp b/src/updater/win32_progress_callback.cpp index e35742e16..6bcf7d10d 100644 --- a/src/updater/win32_progress_callback.cpp +++ b/src/updater/win32_progress_callback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "win32_progress_callback.h" diff --git a/src/updater/win32_progress_callback.h b/src/updater/win32_progress_callback.h index 443426a61..45a758086 100644 --- a/src/updater/win32_progress_callback.h +++ b/src/updater/win32_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/progress_callback.h" diff --git a/src/util/cd_image.cpp b/src/util/cd_image.cpp index effd2eaeb..fd4c29f51 100644 --- a/src/util/cd_image.cpp +++ b/src/util/cd_image.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" diff --git a/src/util/cd_image.h b/src/util/cd_image.h index c1ae38257..503974abd 100644 --- a/src/util/cd_image.h +++ b/src/util/cd_image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/cd_image_bin.cpp b/src/util/cd_image_bin.cpp index 0de1f1bf4..3dbc4fa15 100644 --- a/src/util/cd_image_bin.cpp +++ b/src/util/cd_image_bin.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_chd.cpp b/src/util/cd_image_chd.cpp index 692589d3a..f6018d03a 100644 --- a/src/util/cd_image_chd.cpp +++ b/src/util/cd_image_chd.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_cue.cpp b/src/util/cd_image_cue.cpp index 121dacc4f..766dfeb47 100644 --- a/src/util/cd_image_cue.cpp +++ b/src/util/cd_image_cue.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_device.cpp b/src/util/cd_image_device.cpp index 5ef2bd1b1..501fcc7b7 100644 --- a/src/util/cd_image_device.cpp +++ b/src/util/cd_image_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "assert.h" #include "cd_image.h" diff --git a/src/util/cd_image_ecm.cpp b/src/util/cd_image_ecm.cpp index 860a67a56..dd1a6b69c 100644 --- a/src/util/cd_image_ecm.cpp +++ b/src/util/cd_image_ecm.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_hasher.cpp b/src/util/cd_image_hasher.cpp index 6a9862cf5..4d29f44e4 100644 --- a/src/util/cd_image_hasher.cpp +++ b/src/util/cd_image_hasher.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image_hasher.h" #include "cd_image.h" diff --git a/src/util/cd_image_hasher.h b/src/util/cd_image_hasher.h index 70b69ef5b..aca6caf3b 100644 --- a/src/util/cd_image_hasher.h +++ b/src/util/cd_image_hasher.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/progress_callback.h" diff --git a/src/util/cd_image_m3u.cpp b/src/util/cd_image_m3u.cpp index 97bd4510d..ff59b109e 100644 --- a/src/util/cd_image_m3u.cpp +++ b/src/util/cd_image_m3u.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_mds.cpp b/src/util/cd_image_mds.cpp index 23aaaa22d..a190d41fa 100644 --- a/src/util/cd_image_mds.cpp +++ b/src/util/cd_image_mds.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "assert.h" #include "cd_image.h" diff --git a/src/util/cd_image_memory.cpp b/src/util/cd_image_memory.cpp index f29455b17..6532ae6bf 100644 --- a/src/util/cd_image_memory.cpp +++ b/src/util/cd_image_memory.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_pbp.cpp b/src/util/cd_image_pbp.cpp index e6da1e408..e717fa2ec 100644 --- a/src/util/cd_image_pbp.cpp +++ b/src/util/cd_image_pbp.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_ppf.cpp b/src/util/cd_image_ppf.cpp index eb56d8ca9..a929fcdd1 100644 --- a/src/util/cd_image_ppf.cpp +++ b/src/util/cd_image_ppf.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_subchannel_replacement.cpp b/src/util/cd_subchannel_replacement.cpp index e2b9accd0..449637b04 100644 --- a/src/util/cd_subchannel_replacement.cpp +++ b/src/util/cd_subchannel_replacement.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cd_subchannel_replacement.h" #include "common/file_system.h" diff --git a/src/util/cd_subchannel_replacement.h b/src/util/cd_subchannel_replacement.h index a0111fe7a..791a4334c 100644 --- a/src/util/cd_subchannel_replacement.h +++ b/src/util/cd_subchannel_replacement.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "cd_image.h" diff --git a/src/util/compress_helpers.cpp b/src/util/compress_helpers.cpp index de56b7490..44db92712 100644 --- a/src/util/compress_helpers.cpp +++ b/src/util/compress_helpers.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "compress_helpers.h" diff --git a/src/util/compress_helpers.h b/src/util/compress_helpers.h index c14c13679..db47224d4 100644 --- a/src/util/compress_helpers.h +++ b/src/util/compress_helpers.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp index 85579c44d..9cc93bc06 100644 --- a/src/util/cubeb_audio_stream.cpp +++ b/src/util/cubeb_audio_stream.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "host.h" #include "imgui_manager.h" diff --git a/src/util/cue_parser.cpp b/src/util/cue_parser.cpp index 95a3bcc39..dfb5a19a8 100644 --- a/src/util/cue_parser.cpp +++ b/src/util/cue_parser.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "cue_parser.h" diff --git a/src/util/cue_parser.h b/src/util/cue_parser.h index 3b3d82f4f..397b181e3 100644 --- a/src/util/cue_parser.h +++ b/src/util/cue_parser.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "cd_image.h" diff --git a/src/util/d3d11_device.cpp b/src/util/d3d11_device.cpp index f9678a341..09af8b9f5 100644 --- a/src/util/d3d11_device.cpp +++ b/src/util/d3d11_device.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d11_device.h" #include "core/host.h" // TODO: Remove me diff --git a/src/util/d3d11_device.h b/src/util/d3d11_device.h index 71ed56fe1..151a7b112 100644 --- a/src/util/d3d11_device.h +++ b/src/util/d3d11_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d11_pipeline.cpp b/src/util/d3d11_pipeline.cpp index d8d293cf9..ada7f4029 100644 --- a/src/util/d3d11_pipeline.cpp +++ b/src/util/d3d11_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d11_pipeline.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_pipeline.h b/src/util/d3d11_pipeline.h index 1b78cfb77..88e825750 100644 --- a/src/util/d3d11_pipeline.h +++ b/src/util/d3d11_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d11_stream_buffer.cpp b/src/util/d3d11_stream_buffer.cpp index 772d3296d..755b569ec 100644 --- a/src/util/d3d11_stream_buffer.cpp +++ b/src/util/d3d11_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d11_stream_buffer.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_stream_buffer.h b/src/util/d3d11_stream_buffer.h index 29e1ef403..c09a08d40 100644 --- a/src/util/d3d11_stream_buffer.h +++ b/src/util/d3d11_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d11_texture.cpp b/src/util/d3d11_texture.cpp index 66f36cce1..fa60edc60 100644 --- a/src/util/d3d11_texture.cpp +++ b/src/util/d3d11_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d11_texture.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_texture.h b/src/util/d3d11_texture.h index 5f459161f..03840a070 100644 --- a/src/util/d3d11_texture.h +++ b/src/util/d3d11_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d12_builders.cpp b/src/util/d3d12_builders.cpp index 3e093a8ae..ed297cc9e 100644 --- a/src/util/d3d12_builders.cpp +++ b/src/util/d3d12_builders.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_builders.h" #include "d3d12_device.h" diff --git a/src/util/d3d12_builders.h b/src/util/d3d12_builders.h index c1785d24a..ae2970716 100644 --- a/src/util/d3d12_builders.h +++ b/src/util/d3d12_builders.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d12_descriptor_heap_manager.cpp b/src/util/d3d12_descriptor_heap_manager.cpp index ae6120512..7da9d7101 100644 --- a/src/util/d3d12_descriptor_heap_manager.cpp +++ b/src/util/d3d12_descriptor_heap_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_descriptor_heap_manager.h" diff --git a/src/util/d3d12_descriptor_heap_manager.h b/src/util/d3d12_descriptor_heap_manager.h index 62cff543e..f32f22794 100644 --- a/src/util/d3d12_descriptor_heap_manager.h +++ b/src/util/d3d12_descriptor_heap_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d12_device.cpp b/src/util/d3d12_device.cpp index c12371461..ca64fed4e 100644 --- a/src/util/d3d12_device.cpp +++ b/src/util/d3d12_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_device.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_device.h b/src/util/d3d12_device.h index 5bd6cf5cf..9167042e6 100644 --- a/src/util/d3d12_device.h +++ b/src/util/d3d12_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d12_pipeline.cpp b/src/util/d3d12_pipeline.cpp index 459b7fa2a..09476f024 100644 --- a/src/util/d3d12_pipeline.cpp +++ b/src/util/d3d12_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_pipeline.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_pipeline.h b/src/util/d3d12_pipeline.h index 2ba9e5ffb..bca9494fa 100644 --- a/src/util/d3d12_pipeline.h +++ b/src/util/d3d12_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_device.h" diff --git a/src/util/d3d12_stream_buffer.cpp b/src/util/d3d12_stream_buffer.cpp index 478782ba9..ed16213e1 100644 --- a/src/util/d3d12_stream_buffer.cpp +++ b/src/util/d3d12_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_stream_buffer.h" #include "d3d12_device.h" diff --git a/src/util/d3d12_stream_buffer.h b/src/util/d3d12_stream_buffer.h index cb652bf04..c99ce417d 100644 --- a/src/util/d3d12_stream_buffer.h +++ b/src/util/d3d12_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d12_texture.cpp b/src/util/d3d12_texture.cpp index 6c33a3044..cf7c70351 100644 --- a/src/util/d3d12_texture.cpp +++ b/src/util/d3d12_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d12_texture.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_texture.h b/src/util/d3d12_texture.h index 189de1400..c8f31a022 100644 --- a/src/util/d3d12_texture.h +++ b/src/util/d3d12_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/d3d_common.cpp b/src/util/d3d_common.cpp index 4e199cda7..34794ac09 100644 --- a/src/util/d3d_common.cpp +++ b/src/util/d3d_common.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "d3d_common.h" #include "gpu_device.h" diff --git a/src/util/d3d_common.h b/src/util/d3d_common.h index 8916f4e11..ee7b39712 100644 --- a/src/util/d3d_common.h +++ b/src/util/d3d_common.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/dinput_source.cpp b/src/util/dinput_source.cpp index 960caf591..aadf9e3da 100644 --- a/src/util/dinput_source.cpp +++ b/src/util/dinput_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #define INITGUID diff --git a/src/util/dinput_source.h b/src/util/dinput_source.h index 0cf5f582f..10d3da355 100644 --- a/src/util/dinput_source.h +++ b/src/util/dinput_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #define DIRECTINPUT_VERSION 0x0800 diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp index 3ab012051..f6ce84431 100644 --- a/src/util/gpu_device.cpp +++ b/src/util/gpu_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_device.h" #include "compress_helpers.h" diff --git a/src/util/gpu_device.h b/src/util/gpu_device.h index d4759e97d..6ebcfd696 100644 --- a/src/util/gpu_device.h +++ b/src/util/gpu_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/gpu_framebuffer_manager.h b/src/util/gpu_framebuffer_manager.h index 5663637dd..e5e24c7e9 100644 --- a/src/util/gpu_framebuffer_manager.h +++ b/src/util/gpu_framebuffer_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/gpu_shader_cache.cpp b/src/util/gpu_shader_cache.cpp index 5e7e1cf1a..515200640 100644 --- a/src/util/gpu_shader_cache.cpp +++ b/src/util/gpu_shader_cache.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_shader_cache.h" #include "gpu_device.h" diff --git a/src/util/gpu_shader_cache.h b/src/util/gpu_shader_cache.h index 4b7ea683e..17cb5ca7b 100644 --- a/src/util/gpu_shader_cache.h +++ b/src/util/gpu_shader_cache.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/gpu_texture.cpp b/src/util/gpu_texture.cpp index af8191f85..e07a6d652 100644 --- a/src/util/gpu_texture.cpp +++ b/src/util/gpu_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_texture.h" #include "gpu_device.h" diff --git a/src/util/gpu_texture.h b/src/util/gpu_texture.h index 3af1196bb..0528090f6 100644 --- a/src/util/gpu_texture.h +++ b/src/util/gpu_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/host.cpp b/src/util/host.cpp index 735927236..cdd3e7423 100644 --- a/src/util/host.cpp +++ b/src/util/host.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "host.h" diff --git a/src/util/host.h b/src/util/host.h index a1006098b..0ae46fe23 100644 --- a/src/util/host.h +++ b/src/util/host.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/http_downloader.cpp b/src/util/http_downloader.cpp index 7e2e8903b..e5d36d35c 100644 --- a/src/util/http_downloader.cpp +++ b/src/util/http_downloader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "http_downloader.h" diff --git a/src/util/http_downloader.h b/src/util/http_downloader.h index 6302641e6..75149d1b8 100644 --- a/src/util/http_downloader.h +++ b/src/util/http_downloader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/http_downloader_curl.cpp b/src/util/http_downloader_curl.cpp index 473e543e8..e6a126782 100644 --- a/src/util/http_downloader_curl.cpp +++ b/src/util/http_downloader_curl.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "http_downloader_curl.h" diff --git a/src/util/http_downloader_curl.h b/src/util/http_downloader_curl.h index 7b3a80091..e687be8cd 100644 --- a/src/util/http_downloader_curl.h +++ b/src/util/http_downloader_curl.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "http_downloader.h" diff --git a/src/util/http_downloader_winhttp.cpp b/src/util/http_downloader_winhttp.cpp index c440649dc..038bf5562 100644 --- a/src/util/http_downloader_winhttp.cpp +++ b/src/util/http_downloader_winhttp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "http_downloader_winhttp.h" diff --git a/src/util/http_downloader_winhttp.h b/src/util/http_downloader_winhttp.h index 9f4080947..8540020fa 100644 --- a/src/util/http_downloader_winhttp.h +++ b/src/util/http_downloader_winhttp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "http_downloader.h" diff --git a/src/util/image.cpp b/src/util/image.cpp index 419164027..318a3ae66 100644 --- a/src/util/image.cpp +++ b/src/util/image.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "image.h" diff --git a/src/util/image.h b/src/util/image.h index 91bd3602c..463e3327c 100644 --- a/src/util/image.h +++ b/src/util/image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/imgui_animated.h b/src/util/imgui_animated.h index eeec51fbf..877a5be15 100644 --- a/src/util/imgui_animated.h +++ b/src/util/imgui_animated.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp index 454c7534c..8a7fc0f29 100644 --- a/src/util/imgui_fullscreen.cpp +++ b/src/util/imgui_fullscreen.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "imgui_fullscreen.h" #include "gpu_device.h" diff --git a/src/util/imgui_fullscreen.h b/src/util/imgui_fullscreen.h index 613d000a5..f4daa2f72 100644 --- a/src/util/imgui_fullscreen.h +++ b/src/util/imgui_fullscreen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/imgui_glyph_ranges.inl b/src/util/imgui_glyph_ranges.inl index 4a6db959f..5155b38d9 100644 --- a/src/util/imgui_glyph_ranges.inl +++ b/src/util/imgui_glyph_ranges.inl @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe06f,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf050,0xf050,0xf05e,0xf05e,0xf062,0xf063,0xf067,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0a0,0xf0a0,0xf0ac,0xf0ad,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0e7,0xf0e7,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf140,0xf140,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf51f,0xf51f,0xf538,0xf538,0xf545,0xf545,0xf547,0xf548,0xf57a,0xf57a,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; diff --git a/src/util/imgui_manager.cpp b/src/util/imgui_manager.cpp index c71d3580c..f41cdcd4c 100644 --- a/src/util/imgui_manager.cpp +++ b/src/util/imgui_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "imgui_manager.h" #include "gpu_device.h" diff --git a/src/util/imgui_manager.h b/src/util/imgui_manager.h index 5eecb0005..cfe1678f0 100644 --- a/src/util/imgui_manager.h +++ b/src/util/imgui_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/ini_settings_interface.cpp b/src/util/ini_settings_interface.cpp index 6e3b1c8ac..01c1e1a27 100644 --- a/src/util/ini_settings_interface.cpp +++ b/src/util/ini_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "ini_settings_interface.h" diff --git a/src/util/ini_settings_interface.h b/src/util/ini_settings_interface.h index 8e1c19423..995f32eaa 100644 --- a/src/util/ini_settings_interface.h +++ b/src/util/ini_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/settings_interface.h" diff --git a/src/util/input_manager.cpp b/src/util/input_manager.cpp index 94f83934d..3855a7554 100644 --- a/src/util/input_manager.cpp +++ b/src/util/input_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "input_manager.h" #include "common/assert.h" diff --git a/src/util/input_manager.h b/src/util/input_manager.h index 62ac4dbc5..04e8fc98c 100644 --- a/src/util/input_manager.h +++ b/src/util/input_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/input_source.cpp b/src/util/input_source.cpp index 4282e17d7..c442b3192 100644 --- a/src/util/input_source.cpp +++ b/src/util/input_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "input_source.h" #include "common/string_util.h" diff --git a/src/util/input_source.h b/src/util/input_source.h index c0c088390..9d185028b 100644 --- a/src/util/input_source.h +++ b/src/util/input_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/iso_reader.cpp b/src/util/iso_reader.cpp index d908bb9f5..64193d8fb 100644 --- a/src/util/iso_reader.cpp +++ b/src/util/iso_reader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "iso_reader.h" #include "cd_image.h" diff --git a/src/util/iso_reader.h b/src/util/iso_reader.h index d4162667c..0eb8049f6 100644 --- a/src/util/iso_reader.h +++ b/src/util/iso_reader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/media_capture.cpp b/src/util/media_capture.cpp index 3de04ac89..8eb85b2d5 100644 --- a/src/util/media_capture.cpp +++ b/src/util/media_capture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "media_capture.h" #include "gpu_device.h" diff --git a/src/util/media_capture.h b/src/util/media_capture.h index 72c4a5ff4..467a5b877 100644 --- a/src/util/media_capture.h +++ b/src/util/media_capture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/metal_device.h b/src/util/metal_device.h index 4738907f4..6854d0554 100644 --- a/src/util/metal_device.h +++ b/src/util/metal_device.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/metal_device.mm b/src/util/metal_device.mm index 63bd7a1bd..2bd14f86f 100644 --- a/src/util/metal_device.mm +++ b/src/util/metal_device.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "metal_device.h" diff --git a/src/util/metal_layer.h b/src/util/metal_layer.h index b6c745094..0dc6821d2 100644 --- a/src/util/metal_layer.h +++ b/src/util/metal_layer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 struct WindowInfo; diff --git a/src/util/metal_stream_buffer.h b/src/util/metal_stream_buffer.h index 65ccfa54f..6db4da91c 100644 --- a/src/util/metal_stream_buffer.h +++ b/src/util/metal_stream_buffer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/metal_stream_buffer.mm b/src/util/metal_stream_buffer.mm index 453f0a652..4a836a7ff 100644 --- a/src/util/metal_stream_buffer.mm +++ b/src/util/metal_stream_buffer.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "metal_stream_buffer.h" #include "metal_device.h" diff --git a/src/util/opengl_context.cpp b/src/util/opengl_context.cpp index c6e2323c5..b78e98be1 100644 --- a/src/util/opengl_context.cpp +++ b/src/util/opengl_context.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context.h" #include "opengl_loader.h" diff --git a/src/util/opengl_context.h b/src/util/opengl_context.h index f7e5cedb3..0cb5cc3dc 100644 --- a/src/util/opengl_context.h +++ b/src/util/opengl_context.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_context_agl.h b/src/util/opengl_context_agl.h index 953cae6c5..a06b7bba0 100644 --- a/src/util/opengl_context_agl.h +++ b/src/util/opengl_context_agl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_context_agl.mm b/src/util/opengl_context_agl.mm index 96de6a2f0..c6ebd58b2 100644 --- a/src/util/opengl_context_agl.mm +++ b/src/util/opengl_context_agl.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context_agl.h" diff --git a/src/util/opengl_context_egl.cpp b/src/util/opengl_context_egl.cpp index 7fd6b219d..5cf7344f6 100644 --- a/src/util/opengl_context_egl.cpp +++ b/src/util/opengl_context_egl.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context_egl.h" diff --git a/src/util/opengl_context_egl.h b/src/util/opengl_context_egl.h index 43abd7e4f..4a7fb98b0 100644 --- a/src/util/opengl_context_egl.h +++ b/src/util/opengl_context_egl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_context_egl_wayland.cpp b/src/util/opengl_context_egl_wayland.cpp index 51834335b..e03e7cc40 100644 --- a/src/util/opengl_context_egl_wayland.cpp +++ b/src/util/opengl_context_egl_wayland.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context_egl_wayland.h" diff --git a/src/util/opengl_context_egl_wayland.h b/src/util/opengl_context_egl_wayland.h index f5a8cff8f..e249c8b2f 100644 --- a/src/util/opengl_context_egl_wayland.h +++ b/src/util/opengl_context_egl_wayland.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_context_egl_x11.cpp b/src/util/opengl_context_egl_x11.cpp index af608acac..a80dd4aa6 100644 --- a/src/util/opengl_context_egl_x11.cpp +++ b/src/util/opengl_context_egl_x11.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context_egl_x11.h" diff --git a/src/util/opengl_context_egl_x11.h b/src/util/opengl_context_egl_x11.h index 9337a626d..6ca1dd27f 100644 --- a/src/util/opengl_context_egl_x11.h +++ b/src/util/opengl_context_egl_x11.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_context_wgl.cpp b/src/util/opengl_context_wgl.cpp index a44e07bc3..145108745 100644 --- a/src/util/opengl_context_wgl.cpp +++ b/src/util/opengl_context_wgl.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_context_wgl.h" #include "opengl_loader.h" diff --git a/src/util/opengl_context_wgl.h b/src/util/opengl_context_wgl.h index 836bd0f58..53ac5bddf 100644 --- a/src/util/opengl_context_wgl.h +++ b/src/util/opengl_context_wgl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_device.cpp b/src/util/opengl_device.cpp index b5f1a5849..46208b650 100644 --- a/src/util/opengl_device.cpp +++ b/src/util/opengl_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_device.h" #include "opengl_pipeline.h" diff --git a/src/util/opengl_device.h b/src/util/opengl_device.h index abeabf0b6..0c0f445ac 100644 --- a/src/util/opengl_device.h +++ b/src/util/opengl_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_loader.h b/src/util/opengl_loader.h index 6043ec896..fff6cd7ba 100644 --- a/src/util/opengl_loader.h +++ b/src/util/opengl_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_pipeline.cpp b/src/util/opengl_pipeline.cpp index 90b44b69c..cdd054fe7 100644 --- a/src/util/opengl_pipeline.cpp +++ b/src/util/opengl_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_pipeline.h" #include "compress_helpers.h" diff --git a/src/util/opengl_pipeline.h b/src/util/opengl_pipeline.h index a7cd7e495..39a53bd98 100644 --- a/src/util/opengl_pipeline.h +++ b/src/util/opengl_pipeline.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_stream_buffer.cpp b/src/util/opengl_stream_buffer.cpp index 2eb10c1f8..f31ebf8e7 100644 --- a/src/util/opengl_stream_buffer.cpp +++ b/src/util/opengl_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_stream_buffer.h" diff --git a/src/util/opengl_stream_buffer.h b/src/util/opengl_stream_buffer.h index 023a3ffac..7ae779eec 100644 --- a/src/util/opengl_stream_buffer.h +++ b/src/util/opengl_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/opengl_texture.cpp b/src/util/opengl_texture.cpp index 9882ab469..4dcbd6c75 100644 --- a/src/util/opengl_texture.cpp +++ b/src/util/opengl_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "opengl_texture.h" #include "opengl_device.h" diff --git a/src/util/opengl_texture.h b/src/util/opengl_texture.h index 27abf4470..4a4dd03e8 100644 --- a/src/util/opengl_texture.h +++ b/src/util/opengl_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/page_fault_handler.cpp b/src/util/page_fault_handler.cpp index 0cb2d6daa..f235f882d 100644 --- a/src/util/page_fault_handler.cpp +++ b/src/util/page_fault_handler.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "page_fault_handler.h" diff --git a/src/util/page_fault_handler.h b/src/util/page_fault_handler.h index 7869ff179..5f65a7a86 100644 --- a/src/util/page_fault_handler.h +++ b/src/util/page_fault_handler.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/util/pch.cpp b/src/util/pch.cpp index ef4256aee..8543a442d 100644 --- a/src/util/pch.cpp +++ b/src/util/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "pch.h" diff --git a/src/util/pch.h b/src/util/pch.h index 022c1bc10..2050ba1ec 100644 --- a/src/util/pch.h +++ b/src/util/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/platform_misc.h b/src/util/platform_misc.h index 13b81d841..92992ca14 100644 --- a/src/util/platform_misc.h +++ b/src/util/platform_misc.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "window_info.h" diff --git a/src/util/platform_misc_mac.mm b/src/util/platform_misc_mac.mm index 721eaf39b..a0cf2bbfc 100644 --- a/src/util/platform_misc_mac.mm +++ b/src/util/platform_misc_mac.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Normally, system includes come last. But apparently some of our macro names are redefined... #include diff --git a/src/util/platform_misc_unix.cpp b/src/util/platform_misc_unix.cpp index 2ffbaf42d..d38a94373 100644 --- a/src/util/platform_misc_unix.cpp +++ b/src/util/platform_misc_unix.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "input_manager.h" #include "platform_misc.h" diff --git a/src/util/platform_misc_win32.cpp b/src/util/platform_misc_win32.cpp index 8528e4f17..d394b431c 100644 --- a/src/util/platform_misc_win32.cpp +++ b/src/util/platform_misc_win32.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "platform_misc.h" diff --git a/src/util/postprocessing.cpp b/src/util/postprocessing.cpp index 52fa184b7..15b6ec200 100644 --- a/src/util/postprocessing.cpp +++ b/src/util/postprocessing.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "postprocessing.h" #include "gpu_device.h" diff --git a/src/util/postprocessing.h b/src/util/postprocessing.h index 1ab2f5c53..bdc188dd4 100644 --- a/src/util/postprocessing.h +++ b/src/util/postprocessing.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/postprocessing_shader.cpp b/src/util/postprocessing_shader.cpp index 21979dd3a..55be538dc 100644 --- a/src/util/postprocessing_shader.cpp +++ b/src/util/postprocessing_shader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "postprocessing_shader.h" diff --git a/src/util/postprocessing_shader.h b/src/util/postprocessing_shader.h index 3c8e30f8b..85942e496 100644 --- a/src/util/postprocessing_shader.h +++ b/src/util/postprocessing_shader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/postprocessing_shader_fx.cpp b/src/util/postprocessing_shader_fx.cpp index a76c32c15..7cad33efd 100644 --- a/src/util/postprocessing_shader_fx.cpp +++ b/src/util/postprocessing_shader_fx.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "postprocessing_shader_fx.h" #include "image.h" diff --git a/src/util/postprocessing_shader_fx.h b/src/util/postprocessing_shader_fx.h index 259352a50..21c46832c 100644 --- a/src/util/postprocessing_shader_fx.h +++ b/src/util/postprocessing_shader_fx.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/postprocessing_shader_glsl.cpp b/src/util/postprocessing_shader_glsl.cpp index d2eb321c1..01dd72324 100644 --- a/src/util/postprocessing_shader_glsl.cpp +++ b/src/util/postprocessing_shader_glsl.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "postprocessing_shader_glsl.h" #include "shadergen.h" diff --git a/src/util/postprocessing_shader_glsl.h b/src/util/postprocessing_shader_glsl.h index 1dd5f4126..80d7918c1 100644 --- a/src/util/postprocessing_shader_glsl.h +++ b/src/util/postprocessing_shader_glsl.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/sdl_audio_stream.cpp b/src/util/sdl_audio_stream.cpp index 822863898..2f71ced50 100644 --- a/src/util/sdl_audio_stream.cpp +++ b/src/util/sdl_audio_stream.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "audio_stream.h" diff --git a/src/util/sdl_input_source.cpp b/src/util/sdl_input_source.cpp index 4053aeb5f..fa3a97db5 100644 --- a/src/util/sdl_input_source.cpp +++ b/src/util/sdl_input_source.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "sdl_input_source.h" #include "input_manager.h" diff --git a/src/util/sdl_input_source.h b/src/util/sdl_input_source.h index 14e0a2349..34682f793 100644 --- a/src/util/sdl_input_source.h +++ b/src/util/sdl_input_source.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "input_source.h" diff --git a/src/util/shadergen.cpp b/src/util/shadergen.cpp index 517c637fb..f1835537f 100644 --- a/src/util/shadergen.cpp +++ b/src/util/shadergen.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "shadergen.h" diff --git a/src/util/shadergen.h b/src/util/shadergen.h index bc92cc935..8c8077f88 100644 --- a/src/util/shadergen.h +++ b/src/util/shadergen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/sockets.cpp b/src/util/sockets.cpp index 15f9ae6f4..1ffccaa30 100644 --- a/src/util/sockets.cpp +++ b/src/util/sockets.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2015-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "sockets.h" #include "platform_misc.h" diff --git a/src/util/sockets.h b/src/util/sockets.h index ac0e58a34..2357c83a3 100644 --- a/src/util/sockets.h +++ b/src/util/sockets.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2015-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/state_wrapper.cpp b/src/util/state_wrapper.cpp index 4d609ae90..5e244cf16 100644 --- a/src/util/state_wrapper.cpp +++ b/src/util/state_wrapper.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "state_wrapper.h" #include "common/log.h" diff --git a/src/util/state_wrapper.h b/src/util/state_wrapper.h index 971a94ebc..9ac2b86d8 100644 --- a/src/util/state_wrapper.h +++ b/src/util/state_wrapper.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_builders.cpp b/src/util/vulkan_builders.cpp index 225fe5cda..6f7fa4173 100644 --- a/src/util/vulkan_builders.cpp +++ b/src/util/vulkan_builders.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_builders.h" diff --git a/src/util/vulkan_builders.h b/src/util/vulkan_builders.h index 0038859f5..f65f2e1aa 100644 --- a/src/util/vulkan_builders.h +++ b/src/util/vulkan_builders.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_device.cpp b/src/util/vulkan_device.cpp index 810dc3071..904d57a9e 100644 --- a/src/util/vulkan_device.cpp +++ b/src/util/vulkan_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_device.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_device.h b/src/util/vulkan_device.h index 994efb530..dd6231989 100644 --- a/src/util/vulkan_device.h +++ b/src/util/vulkan_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_entry_points.h b/src/util/vulkan_entry_points.h index 69cf5ca4c..5f45e3947 100644 --- a/src/util/vulkan_entry_points.h +++ b/src/util/vulkan_entry_points.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_entry_points.inl b/src/util/vulkan_entry_points.inl index d313d91ed..90320b332 100644 --- a/src/util/vulkan_entry_points.inl +++ b/src/util/vulkan_entry_points.inl @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // Expands the VULKAN_ENTRY_POINT macro for each function when this file is included. // Parameters: Function name, is required diff --git a/src/util/vulkan_loader.cpp b/src/util/vulkan_loader.cpp index 8089ffd8a..ea7f67051 100644 --- a/src/util/vulkan_loader.cpp +++ b/src/util/vulkan_loader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // No better place for this.. #define VMA_IMPLEMENTATION diff --git a/src/util/vulkan_loader.h b/src/util/vulkan_loader.h index ca3f91679..cf7d267bc 100644 --- a/src/util/vulkan_loader.h +++ b/src/util/vulkan_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_pipeline.cpp b/src/util/vulkan_pipeline.cpp index cda46ecc8..10dc0e3cb 100644 --- a/src/util/vulkan_pipeline.cpp +++ b/src/util/vulkan_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_pipeline.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_pipeline.h b/src/util/vulkan_pipeline.h index d77b5637f..13324f3be 100644 --- a/src/util/vulkan_pipeline.h +++ b/src/util/vulkan_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_device.h" #include "vulkan_loader.h" diff --git a/src/util/vulkan_stream_buffer.cpp b/src/util/vulkan_stream_buffer.cpp index e2baa875f..21824134c 100644 --- a/src/util/vulkan_stream_buffer.cpp +++ b/src/util/vulkan_stream_buffer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_stream_buffer.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_stream_buffer.h b/src/util/vulkan_stream_buffer.h index b0ebe9f69..7e95f8a5a 100644 --- a/src/util/vulkan_stream_buffer.h +++ b/src/util/vulkan_stream_buffer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_swap_chain.cpp b/src/util/vulkan_swap_chain.cpp index 3b637a269..5baf36c7c 100644 --- a/src/util/vulkan_swap_chain.cpp +++ b/src/util/vulkan_swap_chain.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_swap_chain.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_swap_chain.h b/src/util/vulkan_swap_chain.h index 7763613fe..94a8c4615 100644 --- a/src/util/vulkan_swap_chain.h +++ b/src/util/vulkan_swap_chain.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/vulkan_texture.cpp b/src/util/vulkan_texture.cpp index 42eaf9b56..80f54b385 100644 --- a/src/util/vulkan_texture.cpp +++ b/src/util/vulkan_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "vulkan_texture.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_texture.h b/src/util/vulkan_texture.h index 9679d88ba..3d7fcfa2f 100644 --- a/src/util/vulkan_texture.h +++ b/src/util/vulkan_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/wav_writer.cpp b/src/util/wav_writer.cpp index 998177236..0084833d9 100644 --- a/src/util/wav_writer.cpp +++ b/src/util/wav_writer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "wav_writer.h" #include "common/file_system.h" diff --git a/src/util/wav_writer.h b/src/util/wav_writer.h index 3d3871dc6..1202bf8cf 100644 --- a/src/util/wav_writer.h +++ b/src/util/wav_writer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/types.h" diff --git a/src/util/win32_raw_input_source.cpp b/src/util/win32_raw_input_source.cpp index c5acdf4aa..476566c19 100644 --- a/src/util/win32_raw_input_source.cpp +++ b/src/util/win32_raw_input_source.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "win32_raw_input_source.h" #include "common/assert.h" diff --git a/src/util/win32_raw_input_source.h b/src/util/win32_raw_input_source.h index a0bb3a456..de8fc5436 100644 --- a/src/util/win32_raw_input_source.h +++ b/src/util/win32_raw_input_source.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/windows_headers.h" diff --git a/src/util/window_info.cpp b/src/util/window_info.cpp index fd66516cd..fa307fb98 100644 --- a/src/util/window_info.cpp +++ b/src/util/window_info.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "window_info.h" diff --git a/src/util/window_info.h b/src/util/window_info.h index 4c9be3184..19a471ed6 100644 --- a/src/util/window_info.h +++ b/src/util/window_info.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once diff --git a/src/util/xinput_source.cpp b/src/util/xinput_source.cpp index 08f03343f..1221fd8a8 100644 --- a/src/util/xinput_source.cpp +++ b/src/util/xinput_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "xinput_source.h" #include "input_manager.h" diff --git a/src/util/xinput_source.h b/src/util/xinput_source.h index c51d907fb..cc9d9310a 100644 --- a/src/util/xinput_source.h +++ b/src/util/xinput_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: CC-BY-NC-ND-4.0 #pragma once #include "common/windows_headers.h"