diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/cdma_pusher.cpp | 21 | ||||
| -rw-r--r-- | src/video_core/command_classes/codecs/h264.cpp | 21 | ||||
| -rw-r--r-- | src/video_core/command_classes/codecs/h264.h | 21 | ||||
| -rw-r--r-- | src/video_core/command_classes/sync_manager.cpp | 21 | ||||
| -rw-r--r-- | src/video_core/command_classes/sync_manager.h | 21 | ||||
| -rw-r--r-- | src/video_core/host_shaders/opengl_present_scaleforce.frag | 23 | ||||
| -rw-r--r-- | src/video_core/texture_cache/util.cpp | 23 | ||||
| -rw-r--r-- | src/video_core/textures/astc.cpp | 17 |
8 files changed, 17 insertions, 151 deletions
diff --git a/src/video_core/cdma_pusher.cpp b/src/video_core/cdma_pusher.cpp index 8dd840558..8e890a85e 100644 --- a/src/video_core/cdma_pusher.cpp +++ b/src/video_core/cdma_pusher.cpp | |||
| @@ -1,22 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) Ryujinx Team and Contributors | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 6 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 7 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 8 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 9 | // furnished to do so, subject to the following conditions: | ||
| 10 | // | ||
| 11 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 12 | // substantial portions of the Software. | ||
| 13 | // | ||
| 14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 15 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 16 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 17 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 18 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 19 | // | ||
| 20 | 3 | ||
| 21 | #include <bit> | 4 | #include <bit> |
| 22 | #include "command_classes/host1x.h" | 5 | #include "command_classes/host1x.h" |
diff --git a/src/video_core/command_classes/codecs/h264.cpp b/src/video_core/command_classes/codecs/h264.cpp index 84f1fa938..e2acd54d4 100644 --- a/src/video_core/command_classes/codecs/h264.cpp +++ b/src/video_core/command_classes/codecs/h264.cpp | |||
| @@ -1,22 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) Ryujinx Team and Contributors | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 6 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 7 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 8 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 9 | // furnished to do so, subject to the following conditions: | ||
| 10 | // | ||
| 11 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 12 | // substantial portions of the Software. | ||
| 13 | // | ||
| 14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 15 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 16 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 17 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 18 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 19 | // | ||
| 20 | 3 | ||
| 21 | #include <array> | 4 | #include <array> |
| 22 | #include <bit> | 5 | #include <bit> |
diff --git a/src/video_core/command_classes/codecs/h264.h b/src/video_core/command_classes/codecs/h264.h index 1899d8e7f..261574364 100644 --- a/src/video_core/command_classes/codecs/h264.h +++ b/src/video_core/command_classes/codecs/h264.h | |||
| @@ -1,22 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) Ryujinx Team and Contributors | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 6 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 7 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 8 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 9 | // furnished to do so, subject to the following conditions: | ||
| 10 | // | ||
| 11 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 12 | // substantial portions of the Software. | ||
| 13 | // | ||
| 14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 15 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 16 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 17 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 18 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 19 | // | ||
| 20 | 3 | ||
| 21 | #pragma once | 4 | #pragma once |
| 22 | 5 | ||
diff --git a/src/video_core/command_classes/sync_manager.cpp b/src/video_core/command_classes/sync_manager.cpp index 19dc9e0ab..67e58046f 100644 --- a/src/video_core/command_classes/sync_manager.cpp +++ b/src/video_core/command_classes/sync_manager.cpp | |||
| @@ -1,22 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) Ryujinx Team and Contributors | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 6 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 7 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 8 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 9 | // furnished to do so, subject to the following conditions: | ||
| 10 | // | ||
| 11 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 12 | // substantial portions of the Software. | ||
| 13 | // | ||
| 14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 15 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 16 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 17 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 18 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 19 | // | ||
| 20 | 3 | ||
| 21 | #include <algorithm> | 4 | #include <algorithm> |
| 22 | #include "sync_manager.h" | 5 | #include "sync_manager.h" |
diff --git a/src/video_core/command_classes/sync_manager.h b/src/video_core/command_classes/sync_manager.h index 2c321ec58..6dfaae080 100644 --- a/src/video_core/command_classes/sync_manager.h +++ b/src/video_core/command_classes/sync_manager.h | |||
| @@ -1,22 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) Ryujinx Team and Contributors | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 6 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 7 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 8 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 9 | // furnished to do so, subject to the following conditions: | ||
| 10 | // | ||
| 11 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 12 | // substantial portions of the Software. | ||
| 13 | // | ||
| 14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 15 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 16 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 17 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 18 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 19 | // | ||
| 20 | 3 | ||
| 21 | #pragma once | 4 | #pragma once |
| 22 | 5 | ||
diff --git a/src/video_core/host_shaders/opengl_present_scaleforce.frag b/src/video_core/host_shaders/opengl_present_scaleforce.frag index 71ff9e1e3..a780373e3 100644 --- a/src/video_core/host_shaders/opengl_present_scaleforce.frag +++ b/src/video_core/host_shaders/opengl_present_scaleforce.frag | |||
| @@ -1,24 +1,5 @@ | |||
| 1 | // MIT License | 1 | // SPDX-FileCopyrightText: 2020 BreadFish64 |
| 2 | // | 2 | // SPDX-License-Identifier: MIT |
| 3 | // Copyright (c) 2020 BreadFish64 | ||
| 4 | // | ||
| 5 | // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| 6 | // of this software and associated documentation files (the "Software"), to deal | ||
| 7 | // in the Software without restriction, including without limitation the rights | ||
| 8 | // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| 9 | // copies of the Software, and to permit persons to whom the Software is | ||
| 10 | // furnished to do so, subject to the following conditions: | ||
| 11 | // | ||
| 12 | // The above copyright notice and this permission notice shall be included in all | ||
| 13 | // copies or substantial portions of the Software. | ||
| 14 | // | ||
| 15 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 16 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 17 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| 18 | // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| 19 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 20 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| 21 | // SOFTWARE. | ||
| 22 | 3 | ||
| 23 | // Adapted from https://github.com/BreadFish64/ScaleFish/tree/master/scaleforce | 4 | // Adapted from https://github.com/BreadFish64/ScaleFish/tree/master/scaleforce |
| 24 | 5 | ||
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 597382331..1820823b2 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp | |||
| @@ -1,30 +1,11 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project | 1 | // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project |
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | 2 | // SPDX-FileCopyrightText: Ryujinx Team and Contributors |
| 3 | // SPDX-License-Identifier: GPL-2.0-or-later AND MIT | ||
| 3 | 4 | ||
| 4 | // This files contains code from Ryujinx | 5 | // This files contains code from Ryujinx |
| 5 | // A copy of the code can be obtained from https://github.com/Ryujinx/Ryujinx | 6 | // A copy of the code can be obtained from https://github.com/Ryujinx/Ryujinx |
| 6 | // The sections using code from Ryujinx are marked with a link to the original version | 7 | // The sections using code from Ryujinx are marked with a link to the original version |
| 7 | 8 | ||
| 8 | // MIT License | ||
| 9 | // | ||
| 10 | // Copyright (c) Ryujinx Team and Contributors | ||
| 11 | // | ||
| 12 | // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| 13 | // associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| 14 | // including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| 15 | // sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| 16 | // furnished to do so, subject to the following conditions: | ||
| 17 | // | ||
| 18 | // The above copyright notice and this permission notice shall be included in all copies or | ||
| 19 | // substantial portions of the Software. | ||
| 20 | // | ||
| 21 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| 22 | // NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 23 | // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 24 | // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 25 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 26 | // | ||
| 27 | |||
| 28 | #include <algorithm> | 9 | #include <algorithm> |
| 29 | #include <array> | 10 | #include <array> |
| 30 | #include <numeric> | 11 | #include <numeric> |
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 28e4beafd..e3f3d3c5d 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp | |||
| @@ -1,17 +1,6 @@ | |||
| 1 | // Copyright 2016 The University of North Carolina at Chapel Hill | 1 | // SPDX-FileCopyrightText: 2016 The University of North Carolina at Chapel Hill |
| 2 | // | 2 | // SPDX-License-Identifier: Apache-2.0 |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); | 3 | |
| 4 | // you may not use this file except in compliance with the License. | ||
| 5 | // You may obtain a copy of the License at | ||
| 6 | // | ||
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 | ||
| 8 | // | ||
| 9 | // Unless required by applicable law or agreed to in writing, software | ||
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, | ||
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 12 | // See the License for the specific language governing permissions and | ||
| 13 | // limitations under the License. | ||
| 14 | // | ||
| 15 | // Please send all BUG REPORTS to <pavel@cs.unc.edu>. | 4 | // Please send all BUG REPORTS to <pavel@cs.unc.edu>. |
| 16 | // <http://gamma.cs.unc.edu/FasTC/> | 5 | // <http://gamma.cs.unc.edu/FasTC/> |
| 17 | 6 | ||