summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2019-01-21 02:40:25 +0100
committerJames Rowe <jroweboy@gmail.com>2019-01-21 02:40:25 +0100
commitea73ffe202e44ed45191eea10bbecbf35e158f32 (patch)
treeaca799431eca75b89dace71d604e11d84c8f3630
parentPrevent estimated time from flashing after slow shader compilation starts (diff)
downloadyuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.gz
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.bz2
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.lz
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.xz
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.tar.zst
yuzu-ea73ffe202e44ed45191eea10bbecbf35e158f32.zip
-rw-r--r--src/video_core/rasterizer_interface.h4
-rw-r--r--src/yuzu/loading_screen.cpp12
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<void(LoadCallbackStage, std::size_t, std::size_t)>;
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},
};
}