Using a safer header cache.

fynv · Jul 9, 2020 · 48d8062 · 48d8062
1 parent b649a80
commit 48d8062
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/Context.cpp b/Context.cpp
@@ -66,7 +66,7 @@ namespace VkInline
 #endif
 
 		bool m_verbose;
-		std::unordered_map<std::string, const char*> m_header_map;
+		std::unordered_map<std::string, std::string> m_header_map;
 		std::vector<std::string> m_code_blocks;
 
 		std::string m_header_of_dynamic_code;

diff --git a/glslc.cpp b/glslc.cpp
@@ -116,9 +116,9 @@ const TBuiltInResource DefaultTBuiltInResource =
 
 class BuiltInIncluder : public glslang::TShader::Includer
 {
-	const std::unordered_map<std::string, const char*>* m_headers;
+	const std::unordered_map<std::string, std::string>* m_headers;
 public:
-	BuiltInIncluder(const std::unordered_map<std::string, const char*>* headers = nullptr)
+	BuiltInIncluder(const std::unordered_map<std::string, std::string>* headers = nullptr)
 	{
 		m_headers = headers;
 	}
@@ -130,7 +130,7 @@ class BuiltInIncluder : public glslang::TShader::Includer
 			auto iter = m_headers->find(headerName);
 			if (iter != m_headers->end())
 			{
-				IncludeResult* result = new IncludeResult(headerName, iter->second, strlen(iter->second), nullptr);
+				IncludeResult* result = new IncludeResult(headerName, iter->second.c_str(), iter->second.length(), nullptr);
 				return result;
 			}
 		}
@@ -143,7 +143,7 @@ class BuiltInIncluder : public glslang::TShader::Includer
 	}
 };
 
-bool GLSL2SPV(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV, EShLanguage ShaderType)
+bool GLSL2SPV(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV, EShLanguage ShaderType)
 {
 	glslang::InitializeProcess();
 	glslang::TShader Shader(ShaderType);
@@ -214,37 +214,37 @@ bool GLSL2SPV(const char* InputCString, const std::unordered_map<std::string, co
 
 }
 
-bool GLSL2SPV_Compute(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Compute(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangCompute);
 }
 
-bool GLSL2SPV_Vertex(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Vertex(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangVertex);
 }
 
-bool GLSL2SPV_Fragment(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Fragment(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangFragment);
 }
 
-bool GLSL2SPV_Raygen(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Raygen(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangRayGen);
 }
 
-bool GLSL2SPV_Miss(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Miss(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangMiss);
 }
 
-bool GLSL2SPV_ClosestHit(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_ClosestHit(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangClosestHit);
 }
 
-bool GLSL2SPV_Intersect(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV)
+bool GLSL2SPV_Intersect(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV)
 {
 	return GLSL2SPV(InputCString, headers, SpirV, EShLangIntersect);
 }
diff --git a/internal/impl_context.inl b/internal/impl_context.inl
@@ -3,9 +3,9 @@ using namespace SPIRV_CROSS_NAMESPACE;
 #include <unqlite.h>
 #include "crc64.h"
 
-bool GLSL2SPV_Compute(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
-bool GLSL2SPV_Vertex(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
-bool GLSL2SPV_Fragment(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Compute(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Vertex(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Fragment(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
 
 namespace VkInline
 {

diff --git a/internal/impl_context_ex.inl b/internal/impl_context_ex.inl
@@ -1,7 +1,7 @@
-bool GLSL2SPV_Raygen(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
-bool GLSL2SPV_Miss(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
-bool GLSL2SPV_ClosestHit(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
-bool GLSL2SPV_Intersect(const char* InputCString, const std::unordered_map<std::string, const char*>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Raygen(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Miss(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_ClosestHit(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
+bool GLSL2SPV_Intersect(const char* InputCString, const std::unordered_map<std::string, std::string>* headers, std::vector<unsigned int>& SpirV);
 
 namespace VkInline
 {

diff --git a/python/VkInline/SVBuffer.py b/python/VkInline/SVBuffer.py
@@ -1,5 +1,6 @@
 from .Native import ffi, native
 from .ShaderViewable import ShaderViewable
+import ctypes
 
 class SVBuffer(ShaderViewable):
     def __init__(self, elem_type, size, ptr_host_data=None):
@@ -21,6 +22,6 @@ def from_host(self, ptr_host_data):
         native.n_svbuffer_from_host(self.m_cptr, ffi.cast("void *", ptr_host_data))
 
     def to_host(self, ptr_host_data, begin = 0, end = -1):
-        native.n_svbuffer_to_host(self.m_cptr, ffi.cast("void *", ptr_host_data), begin, end)
+        native.n_svbuffer_to_host(self.m_cptr, ffi.cast("void *", ptr_host_data), ctypes.c_ulonglong(begin).value, ctypes.c_ulonglong(end).value)