From ea73ffe202e44ed45191eea10bbecbf35e158f32 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sun, 20 Jan 2019 18:40:25 -0700 Subject: Rename step 1 and step 2 to be a little more descriptive --- src/video_core/rasterizer_interface.h | 4 ++-- 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 { enum class LoadCallbackStage { Prepare, - Raw, - Binary, + Decompile, + Build, Complete, }; using DiskResourceLoadCallback = std::function; 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"( QProgressBar {} QProgressBar::chunk {})"; -constexpr const char* PROGRESSBAR_STYLE_RAW = R"( +constexpr const char* PROGRESSBAR_STYLE_DECOMPILE = R"( QProgressBar { background-color: black; border: 2px solid white; @@ -43,7 +43,7 @@ QProgressBar::chunk { background-color: #0ab9e6; })"; -constexpr const char* PROGRESSBAR_STYLE_BINARY = R"( +constexpr const char* PROGRESSBAR_STYLE_BUILD = R"( QProgressBar { background-color: black; border: 2px solid white; @@ -76,14 +76,14 @@ LoadingScreen::LoadingScreen(QWidget* parent) stage_translations = { {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, - {VideoCore::LoadCallbackStage::Raw, tr("Preparing Shaders %1 / %2")}, - {VideoCore::LoadCallbackStage::Binary, tr("Loading Shaders %1 / %2")}, + {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::Raw, PROGRESSBAR_STYLE_RAW}, - {VideoCore::LoadCallbackStage::Binary, PROGRESSBAR_STYLE_BINARY}, + {VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE}, + {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD}, {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, }; } -- cgit v1.2.3