Revert "Merge branch 'master' into 'dev'"

This reverts merge request !17
This commit is contained in:
Crimson Hawk
2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions

View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2018 suyu Emulator Project
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
set(FIDELITYFX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/FidelityFX-FSR/ffx-fsr)

View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2020 suyu Emulator Project
# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
set(SOURCE_FILE ${CMAKE_ARGV3})

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
//!#version 460 core
@@ -39,7 +39,7 @@ layout(set=0,binding=0) uniform sampler2D InputTexture;
#define A_GLSL 1
#define FSR_RCAS_PASSTHROUGH_ALPHA 1
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
#include "ffx_a.h"
#if USE_EASU
@@ -77,7 +77,7 @@ layout (location = 0) out vec4 frag_color;
void CurrFilter(AU2 pos) {
#if USE_EASU
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
AF3 c;
FsrEasuF(c, pos, Const0, Const1, Const2, Const3);
frag_color = AF4(c, texture(InputTexture, frag_texcoord).a);
@@ -88,7 +88,7 @@ void CurrFilter(AU2 pos) {
#endif
#endif
#if USE_RCAS
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
AF4 c;
FsrRcasF(c.r, c.g, c.b, c.a, pos, Const0);
frag_color = c;

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
// Source code is adapted from

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
//!#version 460 core
@@ -33,12 +33,12 @@ layout (location = 0) uniform uvec4 constants[4];
#define A_GLSL 1
#define FSR_RCAS_PASSTHROUGH_ALPHA 1
#ifdef suyu_USE_FP16
#ifdef YUZU_USE_FP16
#define A_HALF
#endif
#include "ffx_a.h"
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
layout (binding=0) uniform sampler2D InputTexture;
#if USE_EASU
#define FSR_EASU_F 1
@@ -74,7 +74,7 @@ layout (location = 0) out vec4 frag_color;
void CurrFilter(AU2 pos)
{
#if USE_EASU
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
AF3 c;
FsrEasuF(c, pos, constants[0], constants[1], constants[2], constants[3]);
frag_color = AF4(c, texture(InputTexture, frag_texcoord).a);
@@ -85,7 +85,7 @@ void CurrFilter(AU2 pos)
#endif
#endif
#if USE_RCAS
#ifndef suyu_USE_FP16
#ifndef YUZU_USE_FP16
AF4 c;
FsrRcasF(c.r, c.g, c.b, c.a, pos, constants[0]);
frag_color = c;

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
// This shader is a workaround for a quirk in NVIDIA OpenGL drivers

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430 core

View File

@@ -7,7 +7,7 @@
#extension GL_ARB_separate_shader_objects : enable
#ifdef suyu_USE_FP16
#ifdef YUZU_USE_FP16
#extension GL_AMD_gpu_shader_half_float : enable
#extension GL_NV_gpu_shader5 : enable

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 430

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
// Code adapted from the following sources:

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 suyu Emulator Project
// SPDX-FileCopyrightText: 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 450

View File

@@ -1,10 +1,10 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core
#extension GL_GOOGLE_include_directive : enable
#define suyu_USE_FP16
#define YUZU_USE_FP16
#define USE_EASU 1
#define VERSION 1

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,10 +1,10 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core
#extension GL_GOOGLE_include_directive : enable
#define suyu_USE_FP16
#define YUZU_USE_FP16
#define USE_RCAS 1
#define VERSION 1

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2019 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2019 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 suyu Emulator Project
// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460
@@ -6,6 +6,6 @@
#extension GL_GOOGLE_include_directive : enable
#define VERSION 2
#define suyu_USE_FP16
#define YUZU_USE_FP16
#include "opengl_present_scaleforce.frag"

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 suyu Emulator Project
// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2022 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2019 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#version 460 core