cmake: generate ReadFile() in the embedded file generator

Author: illwieckz

cmake/DaemonSourceGenerator.cmake

@@ -100,6 +100,12 @@ macro(daemon_embed_files BASENAME SLUG FORMAT TARGETNAME)
 		"const std::unordered_map<std::string, std::string> FileMap\n{\n"
 		"${EMBED_MAP_TEXT}"
 		"};\n"
+		"\n"
+		"const char* ReadFile(Str::StringRef filename)\n"
+		"{\n"
+		"	auto it = FileMap.find(filename);\n"
+		"	return it != FileMap.end() ? it->second.c_str() : nullptr;\n"
+		"}\n"
 		"}"
 	)
 
@@ -108,6 +114,7 @@ macro(daemon_embed_files BASENAME SLUG FORMAT TARGETNAME)
 		"\n"
 		"namespace ${BASENAME} {\n"
 		"extern const std::unordered_map<std::string, std::string> FileMap;\n"
+		"const char* ReadFile(Str::StringRef filename);\n"
 		"};\n"
 	)
 

src/engine/renderer/gl_shader.cpp

@@ -90,14 +90,6 @@ namespace // Implementation details
 		throw ShaderException(msg.c_str());
 	}
 
-	const char* GetInternalShader(Str::StringRef filename)
-	{
-		auto it = EngineShaders::FileMap.find(filename);
-		if (it != EngineShaders::FileMap.end())
-			return it->second.c_str();
-		return nullptr;
-	}
-
 	void CRLFToLF(std::string& source)
 	{
 		size_t sourcePos = 0;
@@ -160,7 +152,7 @@ namespace // Implementation details
 		{
 			// Look for the shader internally. If not found, look for it externally.
 			// If found neither internally or externally of if empty, then Error.
-			auto text_ptr = GetInternalShader(filename);
+			const char* text_ptr = EngineShaders::ReadFile(filename);
 			if (text_ptr == nullptr)
 				ThrowShaderError(Str::Format("No shader found for shader: %s", filename));
 			return text_ptr;
@@ -182,7 +174,7 @@ namespace // Implementation details
 			if (err)
 				ThrowShaderError(Str::Format("Failed to read shader from file %s: %s", shaderFilename, err.message()));
 
-			auto textPtr = GetInternalShader(filename);
+			const char* textPtr = EngineShaders::ReadFile(filename);
 			std::string internalShaderText;
 			if (textPtr != nullptr)
 				internalShaderText = textPtr;