id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Glslang compiles all RBDOOM shaders to SPIR-V

Browse source
This commit is contained in:
Robert Beckebans 2018-10-28 16:11:05 +01:00
parent 706c153675
commit 80fed3c14a
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
neo/renderer/RenderProgs_GLSL.cpp
View file

@ -1083,7 +1083,12 @@ idStr idRenderProgManager::ConvertCG2GLSL( const idStr& in, const char* name, bo
// RB: check for sampler uniforms
if( vkGLSL )
{
while( token == "uniform" && ( src.PeekTokenString( "sampler2D" ) || src.PeekTokenString( "samplerCUBE" ) || src.PeekTokenString( "sampler3D" ) || src.PeekTokenString( "sampler2DArrayShadow" ) ) )
while( token == "uniform" &&
( src.PeekTokenString( "sampler2D" ) ||
src.PeekTokenString( "samplerCUBE" ) ||
src.PeekTokenString( "sampler3D" ) ||
src.PeekTokenString( "sampler2DArrayShadow" ) ||
src.PeekTokenString( "sampler2DArray" ) ) )
{
idStr sampler;
@ -1325,7 +1330,14 @@ idStr idRenderProgManager::ConvertCG2GLSL( const idStr& in, const char* name, bo
if( idStr::Cmp( uniformList[i].c_str(), "rpShadowMatrices" ) == 0 )
{
program += va( "%s[/* %s */ %d + ", uniformArrayName, uniformList[i].c_str(), i );
if( vkGLSL )
{
program += va( "%s[ ", uniformList[i].c_str() );
}
else
{
program += va( "%s[/* %s */ %d + ", uniformArrayName, uniformList[i].c_str(), i );
}
if( src.ExpectTokenString( "[" ) )
{
@ -1532,6 +1544,13 @@ idStr idRenderProgManager::ConvertCG2GLSL( const idStr& in, const char* name, bo
{
out += "\tvec4 ";
out += uniformList[i];
// TODO fix this ugly hack
if( uniformList[i] == "rpShadowMatrices" )
{
out += "[6*4]";
}
out += ";\n";
}
out += "};\n";