v0.9 Dev Channel #254
Replies: 23 comments 72 replies
-
|
两个界面是不是可以直接合并 |
Beta Was this translation helpful? Give feedback.
-
|
这类似于 UWP 的布局了，用户界面以后要大改，支持配置 ScaleModels.json，做成这种布局也不错。 |
Beta Was this translation helpful? Give feedback.
-
|
关于在用户界面上配置效果参数有了初步的想法 {
"name": "FSR",
"params": [
{
"name": "sharpness",
"label": "锐度"
"description": "FSR 锐度",
"type": "slider",
"min": 0,
"max": 1,
"step": 0.05
}
],
"effects": [
{
"effect": "FSR_EASU",
"scale": [ -1, -1 ]
},
{
"effect": "FSR_RCAS",
"sharpness": "sharpness * 2"
}
]
} |
Beta Was this translation helpful? Give feedback.
-
|
整合 #223 还在考虑中 |
Beta Was this translation helpful? Give feedback.
-
|
想法1：给每个effect加一个when字段，如果条件不成立则跳过这个效果 {
"when": "exe == 'abc'",
"effect": "FSR_EASU",
"scale": [ -1, -1 ]
},
{
"effect": "FSR_RCAS",
"sharpness": "sharpness * 2"
}想法2：创建新的配置文件，根据条件选择缩放模型 {
"when": "exe == 'abc'"
"model": "FSR",
// 调整模型的参数
"params": {
"sharpness": 0.5
},
// 覆盖默认配置
"options": {
"captureMethod": "GDI",
"showFPS": true
}
} |
Beta Was this translation helpful? Give feedback.
-
|
草稿 设计要点：
{
"models": [
{
"name": "FSR",
"internal": true,
"params": ["sharpness"],
"effects": [
{
"effect": "FSR_EASU",
"scale": [ -1, -1 ]
},
{
"effect": "FSR_RCAS",
"sharpness": "sharpness"
}
]
}
],
"conditional": [
"name": "FSR-Auto",
"params": [
{
"name": "sharpness",
"label": "锐度"
"description": "FSR 锐度",
"type": "slider",
"min": 0,
"max": 1,
"step": 0.05
}
],
"conditions": [
{
"when": "EXE = 'abc'",
"model": "FSR",
"params": {
"sharpness": "sharpness * 2"
},
"options": {
"captureMethod": "GDI",
"showFPS": true
}
},
{
"when": "INPUT_WIDTH > 500",
"model": "FSR",
"params": {
"sharpness": "sharpness * 2"
},
"options": {
"captureMethod": "Graphics Capture"
}
}
]
]
}
|
Beta Was this translation helpful? Give feedback.
-
|
我迟早要解决 WGC CPU 占用问题 |
Beta Was this translation helpful? Give feedback.
-
这是 WGC 的优化，画面和光标都不动时没有新的帧，可以降低功耗
可以把无关程序关了，然后放大任务管理器 |
Beta Was this translation helpful? Give feedback.
-
|
那就只剩任务管理器，快速移动时依然是某颗核心暴涨 |
Beta Was this translation helpful? Give feedback.
-
|
WPFCaptureSample.zip |
Beta Was this translation helpful? Give feedback.
-
|
|
Beta Was this translation helpful? Give feedback.
-
|
差不多了，很难有优化的空间了 |
Beta Was this translation helpful? Give feedback.
-
|
如果要重写用户界面，我想做成 win11 的风格，可以参考 PowerToys
PowerToys 是一个宝库，用户界面和代码都可以参考 |
Beta Was this translation helpful? Give feedback.
-
|
This library might be worth taking a look at for a similar looking UI overhaul : https://github.com/lepoco/wpfui |
Beta Was this translation helpful? Give feedback.
-
|
It helps, thank you! |
Beta Was this translation helpful? Give feedback.
-
|
关于 CRT-Royale 我打算再挣扎一下，如果成功移植将成为 Magpie 的大杀器 |
Beta Was this translation helpful? Give feedback.
-
|
结论是：CRT-Royale 只适用于 RetroArch。它对输入的比例和大小都有要求，否则扫描线将错乱，而且不支持非整数倍缩放。
|
Beta Was this translation helpful? Give feedback.
-
|
虽然 CRT-Royale 的遮罩不支持非整数倍缩放，但或许可以引入其他 CRT 着色器的遮罩？我会实验一下 |
Beta Was this translation helpful? Give feedback.
-
|
因为使用了像素着色器特有的函数，CRT-Royale 无法移植到 MagpieFX v2 |
Beta Was this translation helpful? Give feedback.
-
|
接下来我计划重写渲染模块
MagpieFX Version 2 全部基于计算着色器，但会支持像素着色器的“风格”，以便于迁移现有的效果。常用效果会针对计算着色器进行优化。 |
Beta Was this translation helpful? Give feedback.
-
|
Have you tried changing numthreads? I do not know if this is true but it might be worth a try. |
Beta Was this translation helpful? Give feedback.
-
|
I've done many experiments and the pattern used by FSR has proven to be the most effective. The numthreads here are (64, 1, 1). They are remapped to swizzle pattern, which makes efficient use of the texture cache. |
Beta Was this translation helpful? Give feedback.
-
|
优化了一下，现在Anime4K_Upscale_S的处理时间比像素着色器版本少20%，换算成帧率的话提高 28%，是计算着色器的胜利。 |
Beta Was this translation helpful? Give feedback.
-
Why not leave pixel shaders (MagpieFX Version 1) working for compatibility? |
Beta Was this translation helpful? Give feedback.
-
|
The main reason is that backwards compatibility complicates the parser and renderer. You will have to port the modifications to v2, which shouldn't be very difficult. |
Beta Was this translation helpful? Give feedback.
-
原生 UWP 控件XAML 岛 + WinUI 2，PowerToys 使用此技术 + 原生体验
- 需要 Win10, v1903 XAML 岛 基于 WPF 的 UI 框架+ 引入依赖较少，无缝迁移 Windows App SDK还不成熟，限制很多 |
Beta Was this translation helpful? Give feedback.
-
|
关于xamlislands可以先等待它对.net6的支持，magpie保留原有的ui界面，在代码中判断用户操作系统是否是1903及以上，若是则启用新ui，否则仍旧用回原本的wpf界面 |
Beta Was this translation helpful? Give feedback.
-
|
我目前倾向于 c++/winrt，但仍需验证可行性。我不会维护两套UI，如果使用XAML岛，我将放弃对1903以下系统的支持（就像 PowerToys 一样）。 |
Beta Was this translation helpful? Give feedback.
-
|
https://github.com/nesherhh/XamlIslandsNET5 支持 .NET 6 的 XAML 岛 CommunityToolkit/Microsoft.Toolkit.Win32#296 |
Beta Was this translation helpful? Give feedback.
-
|
我愿称 C++/WinRT 为调试噩梦 |
Beta Was this translation helpful? Give feedback.
-
|
发现了一个未记录的 API ShowSystemCursor（位于 User32.dll），经过测试可以全局隐藏系统光标。虽然我不想做太多 hack，但如果这个 API 可以兼容串流，可能是比 MagShowSystemCursor 更好的选择 更新：也存在双光标问题 |
Beta Was this translation helpful? Give feedback.
-
|
Magpie 可能已经支持可变帧率 #137 ，虽然我没法验证这一点。可变帧率在技术上等价于 vsync-off，因此只需将帧率设为无限制即可。一些效果很吃性能，如果能用可变帧率体验会好很多，显示器不支持可变帧率的话会导致撕裂 但如果想使用 FSR，可变帧率的效果可能不理想，因为全屏窗口和源窗口的帧率并不一致 |
Beta Was this translation helpful? Give feedback.
-
|
On the topic of new UI, Any thoughts about splitting the scaling modes into pre/post-processing effects and upscaling shaders? Not really sure how well it would work on a regular use case but I think it would make experimenting with an wide variety of scaling modes way easier. 😅 Concept image for illustrating what I'm trying to talk about: |
Beta Was this translation helpful? Give feedback.
-
|
What's the difference between Pre/Post-Processing and Scaling Mode? |
Beta Was this translation helpful? Give feedback.
-
|
There is no fundamental difference between them. What I'm suggesting is to break them down into different categories based on their types and what they do to make them a lot more modular. Scaling Mode would be the base upscaling shaders without any additional effects which would upscale the source image into the screen resolution. e.g. same as the current scales modes such as FSR, ACNet, Anime4k, CRT-Geom etc. Meanwhile Pre/Post-processing would be a separate list of effects which does not alter the size/resolution of the image and only enhances the source or final image. For example: SMAA, FXAA, NVSharpen, Anime4k_restore etc. As for how it would work in practice, ScaleModelsFor example if there is a current preset called "Anime4k w/ Restore VL" {
"name": "Anime4k w/ Restore VL",
"effects": [
{
"effect": "Anime4K_Upscale_L"
},
{
"effect": "Bicubic",
"scale": [ -1, -1 ],
"paramB": 0.0,
"paramC": 0.5
},
{
"effect": "Anime4K_Restore_VL"
}
]
}It would get turned into {
"name": "Anime4k",
"type": "scaler",
"effects": [
{
"effect": "Anime4K_Upscale_L"
},
{
"effect": "Bicubic",
"scale": [ -1, -1 ],
"paramB": 0.0,
"paramC": 0.5
}
]
},
{
"name": "Restore VL",
"type": "effect",
"effects": [
{
"effect": "Anime4K_Restore_VL"
}
]
}Here, the Scaling mode would only display Anime4k in the dropdown list of the GUI meanwhile pre/post-processing would only display Restore VL. |
Beta Was this translation helpful? Give feedback.
-
|
MagpieFX v2 草稿 //!MAGPIE EFFECT
//!VERSION 2
// 计算尺寸时可以使用 INPUT_WIDTH、INPUT_HEIGHT、OUTPUT_WIDTH 和 OUTPUT_HEIGHT
//!OUTPUT_WIDTH INPUT_WIDTH * 2
//!OUTPUT_HEIGHT INPUT_HEIGHT * 2
// 添加此行才能使用 GetFrameCount 和 GetCursorPos
//!USE_DYNAMIC
// 参数定义
// 类似 v1 的 CONSTANT，但不支持内置常量
//!PARAMETER
//!DEFAULT 0
// LABEL 可选，暂时不使用
//!LABEL 锐度
float sharpness;
// 不再支持常量定义
//!TEXTURE
// INPUT 不可作为输出
Texture2D INPUT;
//!TEXTURE
//!WIDTH INPUT_WIDTH
//!HEIGHT INPUT_HEIGHT
//!FORMAT R16G16B16A16_FLOAT
Texture2D tex1;
// 与 v1 不同，从文件读取的纹理不再能作为输出（考虑到这个操作基本没有意义）
// 支持的纹理类型与 v1 相比有变化，添加了一些类型以及不再支持 B8G8R8A8_UNROM
//!COMMON
#define RELU(x) max(x, 0)
//!PASS 1
// 描述此通道以便于调试
//!DESC First Pass
// 可选 PS 风格，依然用 CS 实现
// 默认为 CS
//!STYLE PS
//!IN INPUT
// 同样支持多渲染目标，最多 8 个
//!OUT tex1
float4 Pass1(float2 pos) {
return float4(1, 1, 1, 1);
}
//!PASS 2
//!IN INPUT, tex1
// BLOCK_SIZE 指定一次 dispatch 处理多大的区域
// 可以只有一维，即同时指定长和高
//!BLOCK_SIZE 16, 16
// NUM_THREADS 指定一次 dispatch 有多少并行线程
// 可以少于三维，缺少的维数默认为 1
//!NUM_THREADS 64, 1, 1
void Pass2(uint2 blockStart, uint3 threadId) {
// 向 OUPUT 写入的同时处理光标渲染
// 只在最后一个通道中可用
WriteToOutput(blockStart, float3(1,1,1));
}内置函数： void WriteToOutput(uint2 pos, float3 color); bool CheckViewport(uint2 pos); uint2 GetInputSize(); float2 GetInputPt(); uint2 GetOutputSize(); float2 GetOutputPt(); float2 GetScale(); uint GetFrameCount(); uint2 GetCursorPos(); uint2 Rmp8x8(uint id); 内置宏： MP_BLOCK_WIDTH、MP_BLOCK_HEIGHT：当前通道处理的块的大小（由 //!BLOCK_SIZE 指定） MP_NUM_THREADS_X、MP_NUM_THREADS_Y：当前通道每个线程组的线程数（由 //!NUM_THREADS 指定） MP_PS_STYLE：当前通道是否是像素着色器样式（由 //!STYLE 指定） MP_INLINE_PARAMS：当前通道的参数是否为静态常量（由用户通过 inlineParams 参数指定） MP_DEBUG：当前是否为调试模式（调试模式下编译的着色器不进行优化且含有调试信息） MP_LAST_PASS：当前通道是否是当前效果的最后一个通道 MP_LAST_EFFECT：当前效果是否是当前缩放模式的最后一个效果（最后一个效果要处理视口和光标渲染） MP_FP16：当前是否使用半精度浮点数（由用户通过 fp16 参数指定） MF、MF1、MF2、...、MF4x4：遵守 fp16 参数的浮点数类型。当未指定 fp16，它们为 float... 的别名，否则为 min16float... 的别名 |
Beta Was this translation helpful? Give feedback.
-
|
From current mega/compute the overall fps is increased by ~10%, which is really good. Thank you for your hard work sir. |
Beta Was this translation helpful? Give feedback.
-
|
目前绘制光标已经比较完美，唯一的问题是无法处理系统光标缩放（win11 中为设置->辅助功能->鼠标指针和触控->鼠标指针->大小）。这牵扯到两个场景：
obsproject/obs-studio#2604 对这个问题有一些讨论 |
Beta Was this translation helpful? Give feedback.
-
|
请问透过GetIconInfo获取到的动态光标会变成静态对吗？那我在想是不是可以指定光标配置后在画面上画一个光标出来 |
Beta Was this translation helpful? Give feedback.
-
是的。如果要获取动态光标信息应该使用 DrawIconEx，获取光标文件路径然后自己加载也是可能的。这些都很麻烦，所以 Magpie 不支持动态光标。
Magpie 使用 Direct3D 渲染，使用着色器绘制光标。DrawIconEx 只能将光标绘制到 GDI 平面上，无法和 Direct3D 交互。 |
Beta Was this translation helpful? Give feedback.
-
|
更多信息：https://www.tenforums.com/customization/40973-custom-cursors.html#post569584 补充：Win11 支持 15 级光标缩放，最大尺寸为 256x256。 根据系统光标缩放和屏幕 DPI 缩放计算光标尺寸是可行的，然后我们可以自己提取光标位图，但这太复杂了，我怀疑是否有必要。如果有 Win32 接口可以处理这些细节就好了。 |
Beta Was this translation helpful? Give feedback.
-
|
这里记录每个效果在 v0.9 中的性能提升。比较对象是处理时间，如 v0.8 中应用某个效果需 1ms，v0.9 中需 0.8ms，则性能提高 20%。因为硬件差异，这些结果仅供参考。 配置信息： Magpie 配置： 测试场景：
测试结果
|
Beta Was this translation helpful? Give feedback.
-
|
我说为啥帧率被移除了，原来是因为这个，以后能加回去就太好了，我还挺关注帧数的 |
Beta Was this translation helpful? Give feedback.
-
|
about NIS in this version, is it using NIS version 1.0.2? |
Beta Was this translation helpful? Give feedback.
-
Yes. |
Beta Was this translation helpful? Give feedback.
-
|
I hope that the Anime4K_Upscale_GAN_x2_UL shader will also get ported to this version at some point in the future. This shader variant seems to work well even with noisy/compressed sources like anime and generates better results compared to Anime4K_CNN shaders. |
Beta Was this translation helpful? Give feedback.
-
|
Anime4K_Upscale_GAN_x2_UL is too complex to port, and too slow for most people to use. |
Beta Was this translation helpful? Give feedback.
-
|
现在我最推荐使用 CatmullRom 进行下采样，Lanczos 稍微锐利一点，但更慢。 |
Beta Was this translation helpful? Give feedback.
-
|
https://gist.github.com/igv/36508af3ffc84410fe39761d6969be10/revisions |
Beta Was this translation helpful? Give feedback.
-
|
已更新！ |
Beta Was this translation helpful? Give feedback.
-
|
决定使用 XAML Islands 重写用户界面
Win11 中可以应用 Mica 材质
|
Beta Was this translation helpful? Give feedback.
-
|
如果为标题栏添加 Mica，窗口标题的渲染就不正确。还没找到这个问题的解决办法 |
Beta Was this translation helpful? Give feedback.
-
|
PowerToys 已经迁移到 WindowsAppSDK。WindowsAppSDK 1.1包含几个重要功能，应该可以使用了。 只在win11中支持管理员权限... |
Beta Was this translation helpful? Give feedback.
-
|
PowerToys 翻车了，很多人表示打不开设置 microsoft/PowerToys#18015 这个问题和 WindowsAppSDK 的限制有关，现在它不支持以管理员权限运行，所以 PowerToys 不得不创建一个新进程来承载 UI... WindowsAppSDK 1.1 支持管理员权限，但仅限 win11 |
Beta Was this translation helpful? Give feedback.
-
|
已经对鼠标功能进行增强。用户可以打开开始菜单或者 Win+G 或者 Alt+Tab，光标会像往常一样工作，而不是隐藏起来。这是向窗口化 #135 迈出的重要一步。 |
Beta Was this translation helpful? Give feedback.
-
|
可使用快捷键 Control+Alt+D 显示和隐藏游戏内覆盖，包含帧率统计，每个效果在 GPU 中的处理时间，以及未来用于在运行时改变配置和参数。 打开“在 3D 游戏中限制光标”时无法操作游戏内 UI，也不支持增强的鼠标功能和多屏幕。 |
Beta Was this translation helpful? Give feedback.
-
|
目前的GUI在100%系统缩放下工作正常，但是在更高的缩放下例如200%下显示有些不正常，变成了一小块 |
Beta Was this translation helpful? Give feedback.
-
|
请拉取最新提交。在 FPS 上右键可调整样式 |
Beta Was this translation helpful? Give feedback.
-
|
好快，已经正常了，大佬牛皮！ |
Beta Was this translation helpful? Give feedback.
-
|
libretro的自适应锐化还是很多年前的版本，算法的原作者在这里更新 |
Beta Was this translation helpful? Give feedback.
-
|
可惜无法跟进，单通道版本使用了 ddx 和 ddy，这是像素着色器专用的函数。双通道版本不适合针对计算着色器进行优化，速度太慢。 |
Beta Was this translation helpful? Give feedback.
-
|
我正在考虑更改默认热键。Alt+F11 来自于 IntegerScaler，使用的原因是 F11 有全屏的含义，因此这个热键较为直观。它有一些问题，一是容易和游戏内置的全屏快捷键冲突，最典型的是《我的世界》，另外 Alt 和 F11 相距较远，又都位于键盘右侧，使用起来不太方便。 |
Beta Was this translation helpful? Give feedback.
-
|
“在3D游戏中限制光标”已升级为“3D游戏模式”，提供该选项的原因是 3D 游戏处理光标的方式很独特。启用这个选项后：
一个严重的问题是游戏内覆盖开启时游戏本身依然可以检测到光标输入或设置光标位置
在这个问题上 Xbox Game Bar 做的很完美。开启 Xbox Game Bar 后游戏便无法影响鼠标了，也无法检测到鼠标的移动。我没找到能做到类似事情的方法。 |
Beta Was this translation helpful? Give feedback.
-
|
目前发现了 Desktops API，只要切换到其他桌面，游戏就无法影响鼠标了。这玩意黑客喜欢用... 或许最简单的方法是打开游戏内覆盖时时改变前台窗口，只要游戏失去焦点，一般都会很安静。 |
Beta Was this translation helpful? Give feedback.
-
|
现在打开游戏内覆盖可能会使游戏进入菜单（因为不在前台了），但总比之前好 |
Beta Was this translation helpful? Give feedback.
-
|
使用中发现 v0.9.0-preview1 性能相对于v0.8.2反而下降，fps 20 -> fps 15 捕获方式： |
Beta Was this translation helpful? Give feedback.
-
|
Beta Was this translation helpful? Give feedback.
-
切换至DwmSharedSurface ，并且使用CatmullRom ，禁用垂直同步后，性能仍比082差。 |
Beta Was this translation helpful? Give feedback.
-
这是有可能的。在不同的 GPU 上有性能差异很正常，至少在我的电脑上 FineSharp 比以前更快了。你可以多试几个效果，虽然测试结果不准，因为绘制 FPS 的逻辑和以前完全不同了。 |
Beta Was this translation helpful? Give feedback.
-
|
v0.9 的功能已经开发完成，没有bug汇报的话过几天就会发布。 |
Beta Was this translation helpful? Give feedback.
-
|
四种模式下，测试了新加算法都正常，包括当前提交进度的LCAS |
Beta Was this translation helpful? Give feedback.
-
|
大部分的效果效率都有提升 針不戳 |
Beta Was this translation helpful? Give feedback.
-
v0.9 主要专注于提升性能，支持计算着色器
路线图 https://github.com/Blinue/Magpie/projects/1
Beta Was this translation helpful? Give feedback.
All reactions