diff options
| author | 2020-02-29 04:38:20 -0300 | |
|---|---|---|
| committer | 2020-03-09 18:40:53 -0300 | |
| commit | 120f688272dc2dbc00db480557aee8838c9fdc8a (patch) | |
| tree | 69faff7a5f3f0bbcba4e84689d8cd72624730fea /src | |
| parent | gl_shader_cache: Reduce registry consistency to debug assert (diff) | |
| download | yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.gz yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.xz yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.zip | |
yuzu/loading_screen: Remove unused shader progress mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/rasterizer_interface.h | 1 | ||||
| -rw-r--r-- | src/yuzu/loading_screen.cpp | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 3e4514b94..1a68e3caa 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h | |||
| @@ -25,7 +25,6 @@ constexpr std::size_t NumQueryTypes = 1; | |||
| 25 | 25 | ||
| 26 | enum class LoadCallbackStage { | 26 | enum class LoadCallbackStage { |
| 27 | Prepare, | 27 | Prepare, |
| 28 | Decompile, | ||
| 29 | Build, | 28 | Build, |
| 30 | Complete, | 29 | Complete, |
| 31 | }; | 30 | }; |
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index 4f2bfab48..2a6483370 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp | |||
| @@ -34,18 +34,6 @@ constexpr char PROGRESSBAR_STYLE_PREPARE[] = R"( | |||
| 34 | QProgressBar {} | 34 | QProgressBar {} |
| 35 | QProgressBar::chunk {})"; | 35 | QProgressBar::chunk {})"; |
| 36 | 36 | ||
| 37 | constexpr char PROGRESSBAR_STYLE_DECOMPILE[] = R"( | ||
| 38 | QProgressBar { | ||
| 39 | background-color: black; | ||
| 40 | border: 2px solid white; | ||
| 41 | border-radius: 4px; | ||
| 42 | padding: 2px; | ||
| 43 | } | ||
| 44 | QProgressBar::chunk { | ||
| 45 | background-color: #0ab9e6; | ||
| 46 | width: 1px; | ||
| 47 | })"; | ||
| 48 | |||
| 49 | constexpr char PROGRESSBAR_STYLE_BUILD[] = R"( | 37 | constexpr char PROGRESSBAR_STYLE_BUILD[] = R"( |
| 50 | QProgressBar { | 38 | QProgressBar { |
| 51 | background-color: black; | 39 | background-color: black; |
| @@ -100,13 +88,11 @@ LoadingScreen::LoadingScreen(QWidget* parent) | |||
| 100 | 88 | ||
| 101 | stage_translations = { | 89 | stage_translations = { |
| 102 | {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, | 90 | {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, |
| 103 | {VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")}, | ||
| 104 | {VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")}, | 91 | {VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")}, |
| 105 | {VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, | 92 | {VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, |
| 106 | }; | 93 | }; |
| 107 | progressbar_style = { | 94 | progressbar_style = { |
| 108 | {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, | 95 | {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, |
| 109 | {VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE}, | ||
| 110 | {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD}, | 96 | {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD}, |
| 111 | {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, | 97 | {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, |
| 112 | }; | 98 | }; |
| @@ -192,8 +178,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size | |||
| 192 | } | 178 | } |
| 193 | 179 | ||
| 194 | // update labels and progress bar | 180 | // update labels and progress bar |
| 195 | if (stage == VideoCore::LoadCallbackStage::Decompile || | 181 | if (stage == VideoCore::LoadCallbackStage::Build) { |
| 196 | stage == VideoCore::LoadCallbackStage::Build) { | ||
| 197 | ui->stage->setText(stage_translations[stage].arg(value).arg(total)); | 182 | ui->stage->setText(stage_translations[stage].arg(value).arg(total)); |
| 198 | } else { | 183 | } else { |
| 199 | ui->stage->setText(stage_translations[stage]); | 184 | ui->stage->setText(stage_translations[stage]); |