Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-08 09:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

yuzu/loading_screen: Remove unused shader progress mode

Browse source
This commit is contained in:
ReinUsesLisp 2020-02-29 04:38:20 -03:00
parent e1932351a9
commit 120f688272
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/video_core/rasterizer_interface.h
View file

@ -25,7 +25,6 @@ constexpr std::size_t NumQueryTypes = 1;
enum class LoadCallbackStage { enum class LoadCallbackStage {
Prepare, Prepare,
Decompile,
Build, Build,
Complete, Complete,
}; };

17
src/yuzu/loading_screen.cpp
View file

@ -34,18 +34,6 @@ constexpr char PROGRESSBAR_STYLE_PREPARE[] = R"(
QProgressBar {} QProgressBar {}
QProgressBar::chunk {})"; 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"( constexpr char PROGRESSBAR_STYLE_BUILD[] = R"(
QProgressBar { QProgressBar {
background-color: black; background-color: black;
@ -100,13 +88,11 @@ LoadingScreen::LoadingScreen(QWidget* parent)
stage_translations = { stage_translations = {
{VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")},
{VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")}, {VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, {VideoCore::LoadCallbackStage::Complete, tr("Launching...")},
}; };
progressbar_style = { progressbar_style = {
{VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE},
{VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE},
{VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD}, {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD},
{VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE},
}; };
@ -192,8 +178,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
} }
// update labels and progress bar // update labels and progress bar
if (stage == VideoCore::LoadCallbackStage::Decompile || if (stage == VideoCore::LoadCallbackStage::Build) {
stage == VideoCore::LoadCallbackStage::Build) {
ui->stage->setText(stage_translations[stage].arg(value).arg(total)); ui->stage->setText(stage_translations[stage].arg(value).arg(total));
} else { } else {
ui->stage->setText(stage_translations[stage]); ui->stage->setText(stage_translations[stage]);