sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shared ShaderProgramManager flags to both fragment and vertex shaders 

Former-commit-id: 10a5b3493df9c1e756702f572c90fbbd6e697039
This commit is contained in:
Lynix 2013-09-06 18:32:28 +02:00
parent c1dc2884b0
commit a7e0ec5984
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Nazara/Renderer/ShaderProgramManager.cpp
View File

@ -191,7 +191,7 @@ NzString NzShaderProgramManager::BuildFragmentCode(const NzShaderProgramManagerP
NzString source; NzString source;
/********************Header********************/ /********************Header********************/
source.Reserve(14 + 24 + 1); source.Reserve(14 + 24 + 24 + 26 + 1);
source += "#version "; source += "#version ";
source += NzString::Number(s_glslVersion); source += NzString::Number(s_glslVersion);
source += "\n\n"; source += "\n\n";
@ -200,6 +200,14 @@ NzString NzShaderProgramManager::BuildFragmentCode(const NzShaderProgramManagerP
source += (params.flags & nzShaderFlags_Deferred) ? '1' : '0'; source += (params.flags & nzShaderFlags_Deferred) ? '1' : '0';
source += '\n'; source += '\n';
source += "#define FLAG_FLIP_UVS ";
source += (params.flags & nzShaderFlags_FlipUVs) ? '1' : '0';
source += '\n';
source += "#define FLAG_INSTANCING ";
source += (params.flags & nzShaderFlags_Instancing) ? '1' : '0';
source += '\n';
source += '\n'; source += '\n';
switch (params.target) switch (params.target)
@ -374,11 +382,15 @@ NzString NzShaderProgramManager::BuildVertexCode(const NzShaderProgramManagerPar
NzString source; NzString source;
/********************Header********************/ /********************Header********************/
source.Reserve(14 + 24 + 26 + 1); source.Reserve(14 + 24 + 24 + 26 + 1);
source += "#version "; source += "#version ";
source += NzString::Number(s_glslVersion); source += NzString::Number(s_glslVersion);
source += "\n\n"; source += "\n\n";
source += "#define FLAG_DEFERRED ";
source += (params.flags & nzShaderFlags_Deferred) ? '1' : '0';
source += '\n';
source += "#define FLAG_FLIP_UVS "; source += "#define FLAG_FLIP_UVS ";
source += (params.flags & nzShaderFlags_FlipUVs) ? '1' : '0'; source += (params.flags & nzShaderFlags_FlipUVs) ? '1' : '0';
source += '\n'; source += '\n';