diff options
| author | chai <chaifix@163.com> | 2018-12-18 00:05:59 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-12-18 00:05:59 +0800 |
| commit | 7d46b9b21e6608968e95d9d19db5bb9442588187 (patch) | |
| tree | 9ff260c00971e0a5b4abe320f24a0b88f26cd7e7 | |
| parent | b6d045629e9b9c06b3377133031b8a24949d46ed (diff) | |
*shader
| -rw-r--r-- | bin/jin.exe | bin | 531456 -> 531456 bytes | |||
| -rw-r--r-- | src/libjin/graphics/shaders/je_jsl_compiler.cpp | 3 | ||||
| -rw-r--r-- | src/libjin/graphics/shaders/je_jsl_compiler.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 49f63bf..d8a1bc7 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/je_jsl_compiler.cpp index 516751e..1be4e1c 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp +++ b/src/libjin/graphics/shaders/je_jsl_compiler.cpp @@ -37,7 +37,8 @@ namespace JinEngine "{ \n" " vec2 xy; \n" " vec2 uv; \n" - "}; \n"; + "}; \n" + "\n"; JinEngine::String JSLCompiler::formatVertexShader(const JinEngine::String& vert) { diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/je_jsl_compiler.h index bca55bc..ed6775a 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.h +++ b/src/libjin/graphics/shaders/je_jsl_compiler.h @@ -21,8 +21,6 @@ namespace JinEngine extern JinEngine::String SHADER_MAIN_TEXTURE; extern JinEngine::String SHADER_VERTEX_COORDS; extern JinEngine::String SHADER_TEXTURE_COORDS; - extern JinEngine::String SHADER_VERSION; - extern JinEngine::String SHADER_COMMON; /// /// Compile JSL into GLSL. |