mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-10-20 18:59:26 +02:00
Compare commits
3 commits
3ba504b19c
...
4ec8941339
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ec8941339 | ||
|
|
de7e6e01d4 | ||
|
|
e0d47f2790 |
3 changed files with 18 additions and 14 deletions
|
|
@ -24,7 +24,7 @@ else()
|
|||
endif()
|
||||
|
||||
if (lz4_FOUND AND NOT TARGET lz4::lz4)
|
||||
if (TARGET LZ4::lz4_shared)
|
||||
if (TARGET LZ4::lz4_shared AND NOT YUZU_STATIC_BUILD)
|
||||
add_library(lz4::lz4 ALIAS LZ4::lz4_shared)
|
||||
elseif (TARGET LZ4::lz4_static)
|
||||
add_library(lz4::lz4 ALIAS LZ4::lz4_static)
|
||||
|
|
|
|||
|
|
@ -83,21 +83,20 @@ void Joycons::ScanThread(std::stop_token stop_token) {
|
|||
constexpr u16 nintendo_vendor_id = 0x057e;
|
||||
Common::SetCurrentThreadName("JoyconScanThread");
|
||||
|
||||
auto last_ret = 0u;
|
||||
do {
|
||||
auto ret = SDL_hid_device_change_count();
|
||||
if (last_ret == 0u || last_ret != ret) {
|
||||
last_ret = ret;
|
||||
SDL_hid_device_info* devs = SDL_hid_enumerate(nintendo_vendor_id, 0x0);
|
||||
for (auto* cur_dev = devs; cur_dev; cur_dev = cur_dev->next) {
|
||||
if (IsDeviceNew(cur_dev)) {
|
||||
LOG_DEBUG(Input, "Device Found,type : {:04X} {:04X}", cur_dev->vendor_id, cur_dev->product_id);
|
||||
RegisterNewDevice(cur_dev);
|
||||
}
|
||||
cur_dev = cur_dev->next;
|
||||
SDL_hid_device_info* devs = SDL_hid_enumerate(nintendo_vendor_id, 0x0);
|
||||
SDL_hid_device_info* cur_dev = devs;
|
||||
|
||||
while (cur_dev) {
|
||||
if (IsDeviceNew(cur_dev)) {
|
||||
LOG_DEBUG(Input, "Device Found,type : {:04X} {:04X}", cur_dev->vendor_id,
|
||||
cur_dev->product_id);
|
||||
RegisterNewDevice(cur_dev);
|
||||
}
|
||||
SDL_hid_free_enumeration(devs);
|
||||
cur_dev = cur_dev->next;
|
||||
}
|
||||
|
||||
SDL_hid_free_enumeration(devs);
|
||||
} while (Common::StoppableTimedWait(stop_token, std::chrono::seconds{5}));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,12 @@ VkViewport GetViewportState(const Device& device, const Maxwell& regs, size_t in
|
|||
|
||||
if (lower_left) {
|
||||
// Flip by surface clip height
|
||||
y += conv(static_cast<f32>(regs.surface_clip.height));
|
||||
const float clip_height = conv(static_cast<f32>(regs.surface_clip.height));
|
||||
if (src.scale_y < 0.0f && y >= clip_height) {
|
||||
y = clip_height - y;
|
||||
} else {
|
||||
y += clip_height;
|
||||
}
|
||||
height = -height;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue