Merge pull request #2 from smoogipoo/masking-ssbo

Fix index out of range with version replace
ppy · Jul 31, 2023 · 6b4feca · 6b4feca
2 parents 22b7f8b + 008c958
commit 6b4feca
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/libveldrid-spirv/libveldrid-spirv.cpp b/src/libveldrid-spirv/libveldrid-spirv.cpp
@@ -442,12 +442,18 @@ CompilationResult *CompileVertexFragment(const CrossCompileInfo &info)
     if (info.Target == GLSL && usesStorageResource)
     {
         std::string key = "#version 330";
-        vsText.replace(vsText.find(key), key.length(), "#version 430");
+        std::size_t idx = vsText.find(key);
+
+        if (idx != std::string::npos)
+            vsText.replace(idx, key.length(), "#version 430");
     }
     else if (info.Target == ESSL && usesStorageResource)
     {
         std::string key = "#version 300";
-        vsText.replace(vsText.find(key), key.length(), "#version 310");
+        std::size_t idx = vsText.find(key);
+
+        if (idx != std::string::npos)
+            vsText.replace(idx, key.length(), "#version 310");
     }
 
     std::string fsText = fsCompiler->compile();
@@ -456,12 +462,18 @@ CompilationResult *CompileVertexFragment(const CrossCompileInfo &info)
     if (info.Target == GLSL && usesStorageResource)
     {
         std::string key = "#version 330";
-        fsText.replace(vsText.find(key), key.length(), "#version 430");
+        std::size_t idx = fsText.find(key);
+
+        if (idx != std::string::npos)
+            fsText.replace(idx, key.length(), "#version 430");
     }
     else if (info.Target == ESSL && usesStorageResource)
     {
         std::string key = "#version 300";
-        fsText.replace(vsText.find(key), key.length(), "#version 310");
+        std::size_t idx = fsText.find(key);
+
+        if (idx != std::string::npos)
+            fsText.replace(idx, key.length(), "#version 310");
     }
 
     CompilationResult *result = new CompilationResult();