summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-02-29 08:38:20 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-03-09 22:40:53 +0100
commit120f688272dc2dbc00db480557aee8838c9fdc8a (patch)
tree69faff7a5f3f0bbcba4e84689d8cd72624730fea /src
parentgl_shader_cache: Reduce registry consistency to debug assert (diff)
downloadyuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.gz
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.bz2
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.lz
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.xz
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.tar.zst
yuzu-120f688272dc2dbc00db480557aee8838c9fdc8a.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/rasterizer_interface.h1
-rw-r--r--src/yuzu/loading_screen.cpp17
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;
enum class LoadCallbackStage {
Prepare,
- Decompile,
Build,
Complete,
};
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]);