Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ allprojects {
force("org.lwjgl:lwjgl-opengl:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-vulkan:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-openal:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-stb:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-stb:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglStbVersion}")
force("org.lwjgl:lwjgl-jemalloc:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-tinyfd:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
force("org.lwjgl:lwjgl-freetype:${(rootProject.extra["versionConfig"] as multiversion.VersionConfig).common.lwjglVersion}")
Expand Down
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/multiversion/CommonConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ class CommonConfig(config: Map<*, *>) {
?: emptyList()

val lwjglVersion: String = config["lwjgl_version"]?.toString().orEmpty()

// LWJGL 3.3.4 移除了旧版 stb_image_resize API(stbir_resize_uint8),而旧版
// Minecraft 的 NativeImage.resizeSubRectTo 链接的正是该 API,因此这类版本需要在
// 配置里单独指定 lwjgl_stb_version(如 3.3.3);缺省时跟随 lwjgl_version。
val lwjglStbVersion: String = config["lwjgl_stb_version"]?.toString()?.takeIf { it.isNotBlank() } ?: lwjglVersion
val architecturyApiVersion: String? = config["architectury_api_version"]?.toString()
val clothConfigVersion: String? = config["cloth_config_version"]?.toString()
val modArtifactMinecraftVer: String = config["mod_artifact_minecraft_ver"]?.toString().orEmpty()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@
import io.homo.superresolution.common.upscale.anime4k.Anime4K;
import io.homo.superresolution.common.upscale.dlss.DLSS;
import io.homo.superresolution.common.upscale.ffxfsr.FfxFSR;
import io.homo.superresolution.common.upscale.ffxfsr.FfxFSR4D3D12;
import io.homo.superresolution.common.upscale.fsr1.FSR1;
import io.homo.superresolution.common.upscale.fsr2.FSR2;
import io.homo.superresolution.common.upscale.none.None;
import io.homo.superresolution.common.upscale.sgsr.v1.Sgsr1;
import io.homo.superresolution.common.upscale.sgsr.v2.Sgsr2;
import io.homo.superresolution.common.upscale.xess.XeSS;
import io.homo.superresolution.core.NativeLibManager;
import io.homo.superresolution.core.graphics.opengl.Gl;
import net.minecraft.network.chat.Component;

Expand Down Expand Up @@ -180,6 +182,40 @@ public class AlgorithmDescriptions {
.customUpscaleRatio(true)
.build();

public static final AlgorithmDescription<FfxFSR4D3D12> FSR4_D3D12 =
AlgorithmDescription.builder(FfxFSR4D3D12.class)
.briefName("AMD FSR 4.1 (D3D12)")
.codeName("fsr4_d3d12")
.displayName("AMD FSR 4.1 (Direct3D 12)")
.requirement(
Requirement.nothing()
.addSupportedOS(new OperatingSystem(
SystemArchitecture.X86_64,
OperatingSystemType.WINDOWS))
.requiredGlExtension("GL_EXT_memory_object")
.requiredGlExtension("GL_EXT_memory_object_win32")
.requiredGlExtension("GL_EXT_semaphore")
.requiredGlExtension("GL_EXT_semaphore_win32")
.glMajorVersion(4)
.glMinorVersion(6)
.isTrue(NativeLibManager::d3d12InteropAvailable)
)
.extraResources(
ExtraResources.builder()
.add(ExtraResource.builder(
FfxFSR4D3D12.UPSCALER_DLL_NAME)
.addRemote(
"https://raw.githubusercontent.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK/v2.3.0/Kits/FidelityFX/signedbin/amd_fidelityfx_upscaler_dx12.dll",
"AMD FidelityFX SDK v2.3.0"
)
.build())
.build()
)
.supportJitter(true)
.qualityPresets(FSR_QUALITY_PRESETS)
.customUpscaleRatio(true)
.build();

public static final AlgorithmDescription<XeSS> XESS = AlgorithmDescription.builder(XeSS.class)
.briefName("Intel XeSS")
.codeName("xess")
Expand Down Expand Up @@ -285,6 +321,7 @@ public static void registryAlgorithms() {
AlgorithmRegistry.registry(FSR1);
AlgorithmRegistry.registry(FSR2);
AlgorithmRegistry.registry(FSR);
AlgorithmRegistry.registry(FSR4_D3D12);
AlgorithmRegistry.registry(XESS);
AlgorithmRegistry.registry(DLSS);
AlgorithmRegistry.registry(SGSR1);
Expand Down
Loading