mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: 修复编译

Browse source
This commit is contained in:
Xu 2026-03-24 08:47:59 +08:00
commit c388aa755a
5 changed files with 12 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/Effects/Effects.vcxproj
View file

@ -366,66 +366,6 @@
<CopyFileToFolders Include="Anime4K\Anime4K_Upscale_GAN_x2_M.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-2x4C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-2x4C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-3x4C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-3x4C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x4C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x4C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x8C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x8C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x16C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x16C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-6x8C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-6x8C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x4C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x4C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x8C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x8C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x16C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x16C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-16x16C-NVL.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-16x16C-NVL-DN.hlsl">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="NIS\NIS_Scaler.hlsli">
<FileType>Document</FileType>
</CopyFileToFolders>

63
src/Effects/Effects.vcxproj.filters
View file

@ -360,66 +360,6 @@
<CopyFileToFolders Include="Anime4K\Anime4K_Upscale_GAN_x2_M.hlsl">
<Filter>Anime4K</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-2x4C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-2x4C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-3x4C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-3x4C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x4C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x4C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x8C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x8C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x16C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-4x16C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-6x8C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-6x8C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x4C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x4C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x8C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x8C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x16C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-8x16C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-16x16C-NVL.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="CuNNy\CuNNy-16x16C-NVL-DN.hlsl">
<Filter>CuNNy</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Bicubic.hlsl" />
<CopyFileToFolders Include="NIS\NIS_Scaler.hlsli">
<Filter>NIS</Filter>
@ -493,9 +433,6 @@
<Filter Include="Pixel Art">
<UniqueIdentifier>{0b58f073-84cb-4c38-919d-80176ae408bc}</UniqueIdentifier>
</Filter>
<Filter Include="CuNNy">
<UniqueIdentifier>{9157745b-aa96-42ce-bdc6-1230dffa326b}</UniqueIdentifier>
</Filter>
<Filter Include="CuNNy2">
<UniqueIdentifier>{52055d56-41dc-409a-a878-3c1278082f6d}</UniqueIdentifier>
</Filter>

7
src/Magpie.Core/ShaderEffectParser.cpp
View file

@ -177,8 +177,10 @@ static bool GetNextToken(std::string_view& source, ParserState& state, std::stri
template <bool SkipBlanks>
static bool CheckNextToken(std::string_view& source, ParserState& state, std::string_view expectedToken) noexcept {
assert(!expectedToken.empty());
std::string_view token;
if (!GetNextToken<SkipBlanks, true>(source, state, token)) {
if (!GetNextToken<SkipBlanks, false>(source, state, token)) {
return false;
}
@ -369,7 +371,8 @@ static bool ResolveHeaderVersion(
return false;
}
if (version != MAGPIE_FX_VERSION) {
// 向后兼容到 4
if (version < 4 || version > MAGPIE_FX_VERSION) {
return false;
}

8
src/Magpie.Core/include/ScalingOptions.h
View file

@ -56,11 +56,9 @@ enum class OutputAlignment {
};
enum class EffectType {
BuiltInShader,
// 下面的类型都未实现
UserShader,
BuiltInONNX,
UserONNX,
Shader,
// 下面的类型未实现
ONNX,
Extension
};

8
src/Magpie/main.cpp
View file

@ -87,11 +87,11 @@ int APIENTRY wWinMain(
std::filesystem::path workingDir = Win32Helper::GetExePath().parent_path();
// 将当前目录设为程序所在目录
FAIL_FAST_IF_WIN32_BOOL_FALSE(SetCurrentDirectory(workingDir.c_str()));
// 依赖的 dll 都位于 app 文件夹
SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
// dll 搜索路径中添加 app 文件夹以及排除当前目录
FAIL_FAST_IF_WIN32_BOOL_FALSE(SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS));
workingDir += L"\\app";
AddDllDirectory(workingDir.c_str());
FAIL_FAST_IF_NULL(AddDllDirectory(workingDir.c_str()));
}
enum {