Skip to content
Merged
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Please match the existing code style and ensure any AI-assisted code is thorough
- **ARMSX2** by the [ARMSX2](https://github.com/ARMSX2/ARMSX2) team (GPL-3.0) — the PlayStation 2 core, a fork of **[PCSX2](https://github.com/pcsx2/pcsx2)** (GPL-3.0), built from source into `libemucore`. PS2 online play uses PCSX2's DEV9 network adapter
- **lsfg-vk** by [PancakeTAS](https://github.com/PancakeTAS/lsfg-vk) (GPL-3.0-or-later) — the original Vulkan reimplementation of the Lossless Scaling frame generation chain
- **LSFG frame generation** by **Camille LaVey** of the [Eden Emulator Project](https://git.eden-emu.dev/eden-emu/eden) (GPL-3.0-or-later) — the Vulkan port of that chain that WinNative's frame generation is derived from. See [Frame generation — what came from Camille LaVey's Eden port](#frame-generation--what-came-from-camille-laveys-eden-port) below
- **DIS optical flow frame generation** by **qwertypower** ([DEVAR Entertainment LLC](https://github.com/qwertypower)) (GPL-3.0) — a complete open-source implementation of a Dense Inverse Search frame generator, the second frame generation engine in WinNative and the one that needs no shaders from anywhere else. See [DIS frame generation — the fully open-source engine](#dis-frame-generation--the-fully-open-source-engine) below
- **DIS optical flow frame generation** by **qwertypower** ([DEVAR Entertainment LLC](https://devar.ai/)) (GPL-3.0) — a complete open-source implementation of a Dense Inverse Search frame generator, the second frame generation engine in WinNative and the one that needs no shaders from anywhere else. See [DIS frame generation — the fully open-source engine](#dis-frame-generation--the-fully-open-source-engine) below
- **DIS optical flow** — the algorithm and its reference implementation come from [OpenCV](https://github.com/opencv/opencv) (`DISOpticalFlow`, [LICENSE](https://github.com/opencv/opencv/blob/5.x/LICENSE)), which adopted Till Kroeger's original [OF_DIS](https://github.com/tikroeger/OF_DIS)
- **DXVK** by [Philip Rebohle and contributors](https://github.com/doitsujin/dxvk) (zlib/libpng) — the `dxbc` shader translator, vendored at `app/src/main/cpp/thirdparty/dxbc` to convert the frame generation shaders to SPIR-V
- **DirectAudio** by [The412Banner](https://github.com/The412Banner/directaudio) (LGPL-2.1-or-later) — the native Wine → Android AAudio audio driver, and the only audio path in WinNative that carries a working microphone. See [DirectAudio — what came from The412Banner's driver](#directaudio--what-came-from-the412banners-driver) below
Expand Down
25 changes: 12 additions & 13 deletions app/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,20 @@ set(SHADER_LIST
"effect_colorblind:frag:effect_colorblind_frag"
"effect_pixelate:frag:effect_pixelate_frag"
"sgsr1:frag:sgsr1_frag"
"dis_gray:comp:dis_gray_comp"
"dis_downsample:comp:dis_downsample_comp"
"dis_sobel:comp:dis_sobel_comp"
"dis_structure:comp:dis_structure_comp"
"dis_luma_r16:comp:dis_luma_r16_comp"
"dis_luma_r32:comp:dis_luma_r32_comp"
"dis_gradient:comp:dis_gradient_comp"
"dis_inverse_search:comp:dis_inverse_search_comp"
"dis_propagate:comp:dis_propagate_comp"
"dis_descent:comp:dis_descent_comp"
"dis_densify:comp:dis_densify_comp"
"dis_vr_prepare:comp:dis_vr_prepare_comp"
"dis_vr_weights:comp:dis_vr_weights_comp"
"dis_vr_coeffs:comp:dis_vr_coeffs_comp"
"dis_interpolate:comp:dis_interpolate_comp"
"dis_vr_prep:comp:dis_vr_prep_comp"
"dis_vr_d1:comp:dis_vr_d1_comp"
"dis_vr_d2:comp:dis_vr_d2_comp"
"dis_vr_w:comp:dis_vr_w_comp"
"dis_vr_coef:comp:dis_vr_coef_comp"
"dis_vr_sor:comp:dis_vr_sor_comp"
"dis_vr_add_resize:comp:dis_vr_add_resize_comp"
"dis_interp:comp:dis_interp_comp"
"dis_vr_add:comp:dis_vr_add_comp"
)

set(SHADER_HEADERS "")
Expand Down Expand Up @@ -178,9 +179,7 @@ add_library(winlator SHARED
winlator/vk/lsfg/lsfg_jni.c
winlator/vk/framegen/fg_present.c
winlator/vk/framegen/fg_jni.c
winlator/vk/dis/dis.cpp
winlator/vk/dis/dis_chain.cpp
winlator/vk/dis/vkr_dis.cpp
winlator/vk/dis/vkr_dis.c
)

add_dependencies(winlator winlator_shaders)
Expand Down
306 changes: 0 additions & 306 deletions app/src/main/cpp/winlator/vk/dis/dis.cpp

This file was deleted.

Loading
Loading