N-archive/pineapple-src
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases Packages Wiki Activity

early-access version 2334

Browse source
This commit is contained in:
pineappleEA 2021-12-22 09:04:50 +01:00
parent 146de706b6
commit 556c973a33
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -508,7 +508,7 @@ set(FFmpeg_COMPONENTS
avutil avutil
swscale) swscale)
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if (UNIX AND NOT APPLE)
Include(FindPkgConfig REQUIRED) Include(FindPkgConfig REQUIRED)
pkg_check_modules(LIBVA libva) pkg_check_modules(LIBVA libva)
endif() endif()

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2333. This is the source code for early-access 2334.
## Legal Notice ## Legal Notice

23
src/core/hle/kernel/svc.cpp
View file

@ -880,22 +880,17 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle
return ResultSuccess; return ResultSuccess;
} }
case GetInfoType::IdleTickCount: { case GetInfoType::IdleTickCount: {
if (handle == 0) { // Verify the input handle is invalid.
LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}", R_UNLESS(handle == InvalidHandle, ResultInvalidHandle);
static_cast<Handle>(handle));
return ResultInvalidHandle;
}
if (info_sub_id != 0xFFFFFFFFFFFFFFFF && // Verify the requested core is valid.
info_sub_id != system.Kernel().CurrentPhysicalCoreIndex()) { const bool core_valid =
LOG_ERROR(Kernel_SVC, "Core is not the current core, got {}", info_sub_id); (info_sub_id == static_cast<u64>(-1ULL)) ||
return ResultInvalidCombination; (info_sub_id == static_cast<u64>(system.Kernel().CurrentPhysicalCoreIndex()));
} R_UNLESS(core_valid, ResultInvalidCombination);
const auto& scheduler = *system.Kernel().CurrentScheduler(); // Get the idle tick count.
const auto* const idle_thread = scheduler.GetIdleThread(); *result = system.Kernel().CurrentScheduler()->GetIdleThread()->GetCpuTime();
*result = idle_thread->GetCpuTime();
return ResultSuccess; return ResultSuccess;
} }
default: default:

2
src/video_core/command_classes/codecs/codec.cpp
View file

@ -32,7 +32,7 @@ constexpr std::array PREFERRED_GPU_DECODERS = {
#ifdef _WIN32 #ifdef _WIN32
AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DXVA2, AV_HWDEVICE_TYPE_DXVA2,
#elif defined(__linux__) #elif defined(__unix__)
AV_HWDEVICE_TYPE_VAAPI, AV_HWDEVICE_TYPE_VAAPI,
AV_HWDEVICE_TYPE_VDPAU, AV_HWDEVICE_TYPE_VDPAU,
#endif #endif