summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2021-07-18 20:56:50 -0300
committerGravatar ameerj2021-07-22 21:51:40 -0400
commit4a82450c8139ee751f23f2d50bec6e748e7c9637 (patch)
tree64f936d17875a34ab7110085add9efbed2aca17f /src
parentshader: Fix disabled attribute default values (diff)
downloadyuzu-4a82450c8139ee751f23f2d50bec6e748e7c9637.tar.gz
yuzu-4a82450c8139ee751f23f2d50bec6e748e7c9637.tar.xz
yuzu-4a82450c8139ee751f23f2d50bec6e748e7c9637.zip
cmake: Remove shader cache version
Diffstat (limited to 'src')
-rw-r--r--src/common/CMakeLists.txt10
-rw-r--r--src/common/scm_rev.cpp.in2
-rw-r--r--src/core/reporter.cpp1
3 files changed, 1 insertions, 12 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index c92266a17..3e34c6c2d 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,8 +1,3 @@
1# Add a custom command to generate a new shader_cache_version hash when any of the following files change
2# NOTE: This is an approximation of what files affect shader generation, its possible something else
3# could affect the result, but much more unlikely than the following files. Keeping a list of files
4# like this allows for much better caching since it doesn't force the user to recompile binary shaders every update
5set(VIDEO_CORE "${CMAKE_SOURCE_DIR}/src/video_core")
6if (DEFINED ENV{AZURECIREPO}) 1if (DEFINED ENV{AZURECIREPO})
7 set(BUILD_REPOSITORY $ENV{AZURECIREPO}) 2 set(BUILD_REPOSITORY $ENV{AZURECIREPO})
8endif() 3endif()
@@ -30,10 +25,7 @@ add_custom_command(OUTPUT scm_rev.cpp
30 -DGIT_EXECUTABLE=${GIT_EXECUTABLE} 25 -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
31 -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake 26 -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake
32 DEPENDS 27 DEPENDS
33 # WARNING! It was too much work to try and make a common location for this list, 28 # Check that the scm_rev files haven't changed
34 # so if you need to change it, please update CMakeModules/GenerateSCMRev.cmake as well
35 # ...
36 # and also check that the scm_rev files haven't changed
37 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" 29 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in"
38 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" 30 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h"
39 # technically we should regenerate if the git version changed, but its not worth the effort imo 31 # technically we should regenerate if the git version changed, but its not worth the effort imo
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in
index 5f126f324..cc88994c6 100644
--- a/src/common/scm_rev.cpp.in
+++ b/src/common/scm_rev.cpp.in
@@ -14,7 +14,6 @@
14#define BUILD_ID "@BUILD_ID@" 14#define BUILD_ID "@BUILD_ID@"
15#define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@" 15#define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@"
16#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@" 16#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
17#define SHADER_CACHE_VERSION "@SHADER_CACHE_VERSION@"
18 17
19namespace Common { 18namespace Common {
20 19
@@ -28,7 +27,6 @@ const char g_build_version[] = BUILD_VERSION;
28const char g_build_id[] = BUILD_ID; 27const char g_build_id[] = BUILD_ID;
29const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE; 28const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE;
30const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING; 29const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
31const char g_shader_cache_version[] = SHADER_CACHE_VERSION;
32 30
33} // namespace 31} // namespace
34 32
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp
index cfaf50105..365b8f906 100644
--- a/src/core/reporter.cpp
+++ b/src/core/reporter.cpp
@@ -62,7 +62,6 @@ json GetYuzuVersionData() {
62 {"build_date", std::string(Common::g_build_date)}, 62 {"build_date", std::string(Common::g_build_date)},
63 {"build_fullname", std::string(Common::g_build_fullname)}, 63 {"build_fullname", std::string(Common::g_build_fullname)},
64 {"build_version", std::string(Common::g_build_version)}, 64 {"build_version", std::string(Common::g_build_version)},
65 {"shader_cache_version", std::string(Common::g_shader_cache_version)},
66 }; 65 };
67} 66}
68 67