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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 

Former-commit-id: 5aedc37bf0ef2df3fff657784171cb6495d7b2ca [formerly 7cdba66033b7fce3b0d739fb53bcb1eb15d234e4] [formerly d1623880ed1e27630a59328717f68c66f3f5783e [formerly 8d1c11755bb60ac964f9f1cbf60ec3c543ec32fb]]
Former-commit-id: 401144b6d943a8378bd0c1b010d28823b8224c4b [formerly 99cfdb9a57be4d0de69616ea5faaa9c02a6dca63]
Former-commit-id: b143897a5f4ff0439d36cd0ae8678673597129d0
This commit is contained in:
Lynix 2016-09-22 00:03:28 +02:00
parent 52cc7bcd2e 0a656ca398
commit d8e4479301
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Renderer/UberShaderPreprocessor.cpp
View File

@ -76,7 +76,7 @@ namespace Nz
code << "#define GLSL_VERSION " << glslVersion << "\n\n";
code << "#define EARLY_FRAGMENT_TEST " << (glslVersion >= 420 || OpenGL::IsSupported(OpenGLExtension_Shader_ImageLoadStore)) << "\n\n";
code << "#define EARLY_FRAGMENT_TEST " << ((glslVersion >= 420 || OpenGL::IsSupported(OpenGLExtension_Shader_ImageLoadStore)) ? '1' : '0') << "\n\n";
for (auto it = shaderStage.flags.begin(); it != shaderStage.flags.end(); ++it)
code << "#define " << it->first << ' ' << ((stageFlags & it->second) ? '1' : '0') << '\n';