diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-04-20 19:42:14 +0200 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-04-23 14:52:58 +0200 |
commit | 5c9feaebb6bfa34bb275ffa59ca823003de20422 (patch) | |
tree | 392bfbd6cc096d4f8dded3b6feeb80b709e984c8 | |
parent | GPU: Add Fast GPU Time Option. (diff) | |
download | yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.gz yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.bz2 yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.lz yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.xz yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.zst yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/engines/kepler_compute.cpp | 3 | ||||
-rw-r--r-- | src/video_core/engines/kepler_memory.cpp | 3 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_dma.cpp | 3 | ||||
-rw-r--r-- | src/video_core/gpu.cpp | 12 | ||||
-rw-r--r-- | src/video_core/gpu.h | 6 | ||||
-rw-r--r-- | src/yuzu/configuration/config.cpp | 3 |
6 files changed, 19 insertions, 11 deletions
diff --git a/src/video_core/engines/kepler_compute.cpp b/src/video_core/engines/kepler_compute.cpp index 894300f57..00a12175f 100644 --- a/src/video_core/engines/kepler_compute.cpp +++ b/src/video_core/engines/kepler_compute.cpp @@ -51,7 +51,8 @@ void KeplerCompute::CallMethod(const GPU::MethodCall& method_call) { } } -void KeplerCompute::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { +void KeplerCompute::CallMultiMethod(u32 method, const u32* base_start, u32 amount, + u32 methods_pending) { for (std::size_t i = 0; i < amount; i++) { CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); } diff --git a/src/video_core/engines/kepler_memory.cpp b/src/video_core/engines/kepler_memory.cpp index e906a1124..586ff15dc 100644 --- a/src/video_core/engines/kepler_memory.cpp +++ b/src/video_core/engines/kepler_memory.cpp @@ -41,7 +41,8 @@ void KeplerMemory::CallMethod(const GPU::MethodCall& method_call) { } } -void KeplerMemory::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { +void KeplerMemory::CallMultiMethod(u32 method, const u32* base_start, u32 amount, + u32 methods_pending) { for (std::size_t i = 0; i < amount; i++) { CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); } diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index 51e606a10..6630005b0 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -36,7 +36,8 @@ void MaxwellDMA::CallMethod(const GPU::MethodCall& method_call) { #undef MAXWELLDMA_REG_INDEX } -void MaxwellDMA::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { +void MaxwellDMA::CallMultiMethod(u32 method, const u32* base_start, u32 amount, + u32 methods_pending) { for (std::size_t i = 0; i < amount; i++) { CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); } diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index d2bd3cc9d..b87fd873d 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -220,9 +220,9 @@ void GPU::CallMethod(const MethodCall& method_call) { } } -void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending) { - LOG_TRACE(HW_GPU, "Processing method {:08X} on subchannel {}", method, - subchannel); +void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, + u32 methods_pending) { + LOG_TRACE(HW_GPU, "Processing method {:08X} on subchannel {}", method, subchannel); ASSERT(subchannel < bound_engines.size()); @@ -230,7 +230,8 @@ void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 CallEngineMultiMethod(method, subchannel, base_start, amount, methods_pending); } else { for (std::size_t i = 0; i < amount; i++) { - CallPullerMethod({method, base_start[i], subchannel, methods_pending - static_cast<u32>(i)}); + CallPullerMethod( + {method, base_start[i], subchannel, methods_pending - static_cast<u32>(i)}); } } } @@ -317,7 +318,8 @@ void GPU::CallEngineMethod(const MethodCall& method_call) { } } -void GPU::CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending) { +void GPU::CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, + u32 methods_pending) { const EngineID engine = bound_engines[subchannel]; switch (engine) { diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index 4d7e2651c..dd51c95b7 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -156,7 +156,8 @@ public: void CallMethod(const MethodCall& method_call); /// Calls a GPU multivalue method. - void CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending); + void CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, + u32 methods_pending); /// Flush all current written commands into the host GPU for execution. void FlushCommands(); @@ -313,7 +314,8 @@ private: void CallEngineMethod(const MethodCall& method_call); /// Calls a GPU engine multivalue method. - void CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending); + void CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, + u32 methods_pending); /// Determines where the method should be executed. bool ExecuteMethodOnEngine(u32 method); diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index c7c11b9dd..59c003f38 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -644,7 +644,8 @@ void Config::ReadRendererValues() { Settings::values.use_asynchronous_gpu_emulation = ReadSetting(QStringLiteral("use_asynchronous_gpu_emulation"), false).toBool(); Settings::values.use_vsync = ReadSetting(QStringLiteral("use_vsync"), true).toBool(); - Settings::values.use_fast_gpu_time = ReadSetting(QStringLiteral("use_fast_gpu_time"), true).toBool(); + Settings::values.use_fast_gpu_time = + ReadSetting(QStringLiteral("use_fast_gpu_time"), true).toBool(); Settings::values.force_30fps_mode = ReadSetting(QStringLiteral("force_30fps_mode"), false).toBool(); |