DaemonFileEmbedder: use Str::StringRef

Author: illwieckz

cmake/DaemonFileEmbedder.cmake

@@ -29,10 +29,15 @@ string(REGEX REPLACE
 
 # A bit more of beautification.
 string(REGEX REPLACE ",$" ",\n" contents "${contents}")
+set(DATA_VARIABLE_NAME "data_${VARIABLE_NAME}")
 
 file(WRITE ${OUTPUT_FILE}
-	"constexpr unsigned char ${VARIABLE_NAME}[] =\n"
+	"constexpr unsigned char ${DATA_VARIABLE_NAME}[] =\n"
 	"{\n"
 	"${contents}"
 	"};\n"
+	"const Str::StringRef ${VARIABLE_NAME} = {\n"
+	"reinterpret_cast<const char*>( ${DATA_VARIABLE_NAME} ),\n"
+	"sizeof ( ${DATA_VARIABLE_NAME} ) - 1\n"
+	"};\n"
 )

cmake/DaemonSourceGenerator.cmake

@@ -123,11 +123,11 @@ macro(daemon_embed_files basename dir list format targetname)
 		)
 
 		string(APPEND embed_H_text
-			"extern const unsigned char ${filename_symbol}[];\n"
+			"extern const Str::StringRef ${filename_symbol};\n"
 		)
 
 		string(APPEND embed_map_text
-			"\t{ \"${filename}\", { ${filename_symbol}, sizeof( ${filename_symbol}) - 1 } },\n"
+			"\t{ \"${filename}\", ${filename_symbol} },\n"
 		)
 	endforeach()
 

src/common/EmbeddedFile.h

@@ -30,11 +30,5 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef COMMON_EMBEDDEDFILE_H_
 #define COMMON_EMBEDDEDFILE_H_
-struct embeddedFileMapEntry_t
-{
-	const unsigned char* data;
-	size_t size;
-};
-
-using embeddedFileMap_t = std::unordered_map<std::string, const embeddedFileMapEntry_t>;
+using embeddedFileMap_t = std::unordered_map<std::string, const Str::StringRef>;
 #endif // COMMON_EMBEDDEDFILE_H_

src/engine/renderer/gl_shader.cpp

@@ -94,7 +94,7 @@ namespace // Implementation details
 	{
 		auto it = EngineShaders::FileMap.find(filename);
 		if (it != EngineShaders::FileMap.end())
-			return (const char*) it->second.data;
+			return it->second.data();
 		return nullptr;
 	}