Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix index out of range with version replace #2

Merged
merged 1 commit into from
Jul 31, 2023
Merged

Fix index out of range with version replace #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/libveldrid-spirv/libveldrid-spirv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
Loading