griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Use filename hash for line directive instead of path

Browse Source 
This ensures same values on all systems.
This commit is contained in:
Clément Foucault
2024-10-15 22:25:53 +02:00
parent f15227946a
commit 39d5013c6e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
View File

@@ -587,6 +587,8 @@ class Preprocessor {
std::string line_directive_prefix(const std::string &filepath)
{
std::string filename = std::regex_replace(filepath, std::regex(R"((?:.*)\/(.*))"), "$1");
std::stringstream suffix;
suffix << "#line 1 ";
#ifdef __APPLE__
@@ -595,12 +597,11 @@ class Preprocessor {
/* TODO(fclem): We could make it work using a macro to choose between the filename and the hash
* at runtime. i.e.: `FILENAME_MACRO(12546546541, 'filename.glsl')` This should work for both
* MSL and GLSL. */
std::string filename = std::regex_replace(filepath, std::regex(R"((?:.*)\/(.*))"), "$1");
if (!filename.empty()) {
suffix << "\"" << filename << "\"";
}
#else
uint64_t hash_value = hash(filepath);
uint64_t hash_value = hash(filename);
/* Fold the value so it fits the GLSL spec. */
hash_value = (hash_value ^ (hash_value >> 32)) & (~uint64_t(0) >> 33);
suffix << std::to_string(uint64_t(hash_value));