lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-20 05:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply shader prefix even if encoding is directly accepted. Closes #2561

Browse Source 
* The prefix, if available, must always be applied for custom shaders to compile
  correctly.
This commit is contained in:
baldurk
2022-04-22 12:55:40 +01:00
parent 8a95818b74
commit 1ae2afc05a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+17 -3
View File
@@ -4244,16 +4244,30 @@ void TextureViewer::reloadCustomShaders(const QString &filter)
QTextStream stream(&fileHandle);
QString source = stream.readAll();
bytebuf shaderBytes(source.toUtf8());
bytebuf shaderBytes;
rdcarray<ShaderEncoding> supported = m_Ctx.CustomShaderEncodings();
rdcarray<ShaderSourcePrefix> prefixes = m_Ctx.CustomShaderSourcePrefixes();
rdcstr errors;
// we don't accept this encoding directly, need to compile
if(!supported.contains(encoding))
if(supported.contains(encoding))
{
// apply any prefix needed
for(const ShaderSourcePrefix &prefix : prefixes)
{
if(prefix.encoding == encoding)
{
source = QString(prefix.prefix) + source;
break;
}
}
shaderBytes = bytebuf(source.toUtf8());
}
else
{
// we don't accept this encoding directly, need to compile
for(const ShaderProcessingTool &tool : m_Ctx.Config().ShaderProcessors)
{
// pick the first tool that can convert to an accepted format