summaryrefslogtreecommitdiff
path: root/src/yuzu/loading_screen.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-13 16:26:24 -0400
committerGitHub <noreply@github.com>2020-03-13 16:26:24 -0400
commit666d431ad8ee4e36f1b7f48d13f3fa63ba3675f2 (patch)
treed0f968d06b2bbc6e378a5a0632cd2d6322fe4e6d /src/yuzu/loading_screen.cpp
parentb30b1f741dcbcb69672d065b0bec4f4a9e5f0993 (diff)
parent244fe132199cb3c67dd9e612d2be856895f8a868 (diff)
Merge pull request #3473 from ReinUsesLisp/shader-purge
gl_shader_cache: Rework shader cache and store texture arrays
Diffstat (limited to 'src/yuzu/loading_screen.cpp')
-rw-r--r--src/yuzu/loading_screen.cpp17
1 files changed, 1 insertions, 16 deletions
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"(
QProgressBar {}
QProgressBar::chunk {})";
-constexpr char PROGRESSBAR_STYLE_DECOMPILE[] = R"(
-QProgressBar {
- background-color: black;
- border: 2px solid white;
- border-radius: 4px;
- padding: 2px;
-}
-QProgressBar::chunk {
- background-color: #0ab9e6;
- width: 1px;
-})";
-
constexpr char PROGRESSBAR_STYLE_BUILD[] = R"(
QProgressBar {
background-color: black;
@@ -100,13 +88,11 @@ LoadingScreen::LoadingScreen(QWidget* parent)
stage_translations = {
{VideoCore::LoadCallbackStage::Prepare, tr("Loading...")},
- {VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Complete, tr("Launching...")},
};
progressbar_style = {
{VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE},
- {VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE},
{VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD},
{VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE},
};
@@ -192,8 +178,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
}
// update labels and progress bar
- if (stage == VideoCore::LoadCallbackStage::Decompile ||
- stage == VideoCore::LoadCallbackStage::Build) {
+ if (stage == VideoCore::LoadCallbackStage::Build) {
ui->stage->setText(stage_translations[stage].arg(value).arg(total));
} else {
ui->stage->setText(stage_translations[stage]);