diff options
| author | 2019-01-20 18:40:25 -0700 | |
|---|---|---|
| committer | 2019-01-20 18:40:25 -0700 | |
| commit | ea73ffe202e44ed45191eea10bbecbf35e158f32 (patch) | |
| tree | aca799431eca75b89dace71d604e11d84c8f3630 /src | |
| parent | Prevent estimated time from flashing after slow shader compilation starts (diff) | |
| download | yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.gz yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.xz yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.zip | |
Rename step 1 and step 2 to be a little more descriptive
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/rasterizer_interface.h | 4 | ||||
| -rw-r--r-- | src/yuzu/loading_screen.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index b2c74afde..ff5310848 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h | |||
| @@ -14,8 +14,8 @@ namespace VideoCore { | |||
| 14 | 14 | ||
| 15 | enum class LoadCallbackStage { | 15 | enum class LoadCallbackStage { |
| 16 | Prepare, | 16 | Prepare, |
| 17 | Raw, | 17 | Decompile, |
| 18 | Binary, | 18 | Build, |
| 19 | Complete, | 19 | Complete, |
| 20 | }; | 20 | }; |
| 21 | using DiskResourceLoadCallback = std::function<void(LoadCallbackStage, std::size_t, std::size_t)>; | 21 | using DiskResourceLoadCallback = std::function<void(LoadCallbackStage, std::size_t, std::size_t)>; |
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index ffa7f5bb2..9ce606863 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp | |||
| @@ -32,7 +32,7 @@ constexpr const char* PROGRESSBAR_STYLE_PREPARE = R"( | |||
| 32 | QProgressBar {} | 32 | QProgressBar {} |
| 33 | QProgressBar::chunk {})"; | 33 | QProgressBar::chunk {})"; |
| 34 | 34 | ||
| 35 | constexpr const char* PROGRESSBAR_STYLE_RAW = R"( | 35 | constexpr const char* PROGRESSBAR_STYLE_DECOMPILE = R"( |
| 36 | QProgressBar { | 36 | QProgressBar { |
| 37 | background-color: black; | 37 | background-color: black; |
| 38 | border: 2px solid white; | 38 | border: 2px solid white; |
| @@ -43,7 +43,7 @@ QProgressBar::chunk { | |||
| 43 | background-color: #0ab9e6; | 43 | background-color: #0ab9e6; |
| 44 | })"; | 44 | })"; |
| 45 | 45 | ||
| 46 | constexpr const char* PROGRESSBAR_STYLE_BINARY = R"( | 46 | constexpr const char* PROGRESSBAR_STYLE_BUILD = R"( |
| 47 | QProgressBar { | 47 | QProgressBar { |
| 48 | background-color: black; | 48 | background-color: black; |
| 49 | border: 2px solid white; | 49 | border: 2px solid white; |
| @@ -76,14 +76,14 @@ LoadingScreen::LoadingScreen(QWidget* parent) | |||
| 76 | 76 | ||
| 77 | stage_translations = { | 77 | stage_translations = { |
| 78 | {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, | 78 | {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, |
| 79 | {VideoCore::LoadCallbackStage::Raw, tr("Preparing Shaders %1 / %2")}, | 79 | {VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")}, |
| 80 | {VideoCore::LoadCallbackStage::Binary, tr("Loading Shaders %1 / %2")}, | 80 | {VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")}, |
| 81 | {VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, | 81 | {VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, |
| 82 | }; | 82 | }; |
| 83 | progressbar_style = { | 83 | progressbar_style = { |
| 84 | {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, | 84 | {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, |
| 85 | {VideoCore::LoadCallbackStage::Raw, PROGRESSBAR_STYLE_RAW}, | 85 | {VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE}, |
| 86 | {VideoCore::LoadCallbackStage::Binary, PROGRESSBAR_STYLE_BINARY}, | 86 | {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD}, |
| 87 | {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, | 87 | {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, |
| 88 | }; | 88 | }; |
| 89 | } | 89 | } |