diff options
| author | 2020-04-20 13:42:14 -0400 | |
|---|---|---|
| committer | 2020-04-23 08:52:58 -0400 | |
| commit | 5c9feaebb6bfa34bb275ffa59ca823003de20422 (patch) | |
| tree | 392bfbd6cc096d4f8dded3b6feeb80b709e984c8 /src | |
| parent | GPU: Add Fast GPU Time Option. (diff) | |
| download | yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.gz yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.tar.xz yuzu-5c9feaebb6bfa34bb275ffa59ca823003de20422.zip | |
Clang Format.
Diffstat (limited to 'src')
| -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) { | |||
| 51 | } | 51 | } |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | void KeplerCompute::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { | 54 | void KeplerCompute::CallMultiMethod(u32 method, const u32* base_start, u32 amount, |
| 55 | u32 methods_pending) { | ||
| 55 | for (std::size_t i = 0; i < amount; i++) { | 56 | for (std::size_t i = 0; i < amount; i++) { |
| 56 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); | 57 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); |
| 57 | } | 58 | } |
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) { | |||
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | void KeplerMemory::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { | 44 | void KeplerMemory::CallMultiMethod(u32 method, const u32* base_start, u32 amount, |
| 45 | u32 methods_pending) { | ||
| 45 | for (std::size_t i = 0; i < amount; i++) { | 46 | for (std::size_t i = 0; i < amount; i++) { |
| 46 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); | 47 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); |
| 47 | } | 48 | } |
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) { | |||
| 36 | #undef MAXWELLDMA_REG_INDEX | 36 | #undef MAXWELLDMA_REG_INDEX |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | void MaxwellDMA::CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) { | 39 | void MaxwellDMA::CallMultiMethod(u32 method, const u32* base_start, u32 amount, |
| 40 | u32 methods_pending) { | ||
| 40 | for (std::size_t i = 0; i < amount; i++) { | 41 | for (std::size_t i = 0; i < amount; i++) { |
| 41 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); | 42 | CallMethod({method, base_start[i], 0, methods_pending - static_cast<u32>(i)}); |
| 42 | } | 43 | } |
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) { | |||
| 220 | } | 220 | } |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending) { | 223 | void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, |
| 224 | LOG_TRACE(HW_GPU, "Processing method {:08X} on subchannel {}", method, | 224 | u32 methods_pending) { |
| 225 | subchannel); | 225 | LOG_TRACE(HW_GPU, "Processing method {:08X} on subchannel {}", method, subchannel); |
| 226 | 226 | ||
| 227 | ASSERT(subchannel < bound_engines.size()); | 227 | ASSERT(subchannel < bound_engines.size()); |
| 228 | 228 | ||
| @@ -230,7 +230,8 @@ void GPU::CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 | |||
| 230 | CallEngineMultiMethod(method, subchannel, base_start, amount, methods_pending); | 230 | CallEngineMultiMethod(method, subchannel, base_start, amount, methods_pending); |
| 231 | } else { | 231 | } else { |
| 232 | for (std::size_t i = 0; i < amount; i++) { | 232 | for (std::size_t i = 0; i < amount; i++) { |
| 233 | CallPullerMethod({method, base_start[i], subchannel, methods_pending - static_cast<u32>(i)}); | 233 | CallPullerMethod( |
| 234 | {method, base_start[i], subchannel, methods_pending - static_cast<u32>(i)}); | ||
| 234 | } | 235 | } |
| 235 | } | 236 | } |
| 236 | } | 237 | } |
| @@ -317,7 +318,8 @@ void GPU::CallEngineMethod(const MethodCall& method_call) { | |||
| 317 | } | 318 | } |
| 318 | } | 319 | } |
| 319 | 320 | ||
| 320 | void GPU::CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending) { | 321 | void GPU::CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, |
| 322 | u32 methods_pending) { | ||
| 321 | const EngineID engine = bound_engines[subchannel]; | 323 | const EngineID engine = bound_engines[subchannel]; |
| 322 | 324 | ||
| 323 | switch (engine) { | 325 | 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: | |||
| 156 | void CallMethod(const MethodCall& method_call); | 156 | void CallMethod(const MethodCall& method_call); |
| 157 | 157 | ||
| 158 | /// Calls a GPU multivalue method. | 158 | /// Calls a GPU multivalue method. |
| 159 | void CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending); | 159 | void CallMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, |
| 160 | u32 methods_pending); | ||
| 160 | 161 | ||
| 161 | /// Flush all current written commands into the host GPU for execution. | 162 | /// Flush all current written commands into the host GPU for execution. |
| 162 | void FlushCommands(); | 163 | void FlushCommands(); |
| @@ -313,7 +314,8 @@ private: | |||
| 313 | void CallEngineMethod(const MethodCall& method_call); | 314 | void CallEngineMethod(const MethodCall& method_call); |
| 314 | 315 | ||
| 315 | /// Calls a GPU engine multivalue method. | 316 | /// Calls a GPU engine multivalue method. |
| 316 | void CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, u32 methods_pending); | 317 | void CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_start, u32 amount, |
| 318 | u32 methods_pending); | ||
| 317 | 319 | ||
| 318 | /// Determines where the method should be executed. | 320 | /// Determines where the method should be executed. |
| 319 | bool ExecuteMethodOnEngine(u32 method); | 321 | 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() { | |||
| 644 | Settings::values.use_asynchronous_gpu_emulation = | 644 | Settings::values.use_asynchronous_gpu_emulation = |
| 645 | ReadSetting(QStringLiteral("use_asynchronous_gpu_emulation"), false).toBool(); | 645 | ReadSetting(QStringLiteral("use_asynchronous_gpu_emulation"), false).toBool(); |
| 646 | Settings::values.use_vsync = ReadSetting(QStringLiteral("use_vsync"), true).toBool(); | 646 | Settings::values.use_vsync = ReadSetting(QStringLiteral("use_vsync"), true).toBool(); |
| 647 | Settings::values.use_fast_gpu_time = ReadSetting(QStringLiteral("use_fast_gpu_time"), true).toBool(); | 647 | Settings::values.use_fast_gpu_time = |
| 648 | ReadSetting(QStringLiteral("use_fast_gpu_time"), true).toBool(); | ||
| 648 | Settings::values.force_30fps_mode = | 649 | Settings::values.force_30fps_mode = |
| 649 | ReadSetting(QStringLiteral("force_30fps_mode"), false).toBool(); | 650 | ReadSetting(QStringLiteral("force_30fps_mode"), false).toBool(); |
| 650 | 651 | ||