aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/render/jsl.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-05-18 15:27:59 +0800
committerchai <chaifix@163.com>2018-05-18 15:27:59 +0800
commit9458eb868631b29e00182c37f1c7e46981b68edd (patch)
tree2dea921057473e91e8267d997c743896887f7618 /src/libjin/render/jsl.cpp
parent1b773ad2c250e09c09c065eb3eec64bfebde09ca (diff)
GC
Diffstat (limited to 'src/libjin/render/jsl.cpp')
-rw-r--r--src/libjin/render/jsl.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libjin/render/jsl.cpp b/src/libjin/render/jsl.cpp
index 49bb18f..58b9a15 100644
--- a/src/libjin/render/jsl.cpp
+++ b/src/libjin/render/jsl.cpp
@@ -9,10 +9,11 @@ namespace render
"#version 120 \n"
"#define number float \n"
"#define Image sampler2D \n"
- "#define Texel texture2D \n"
+ "#define Canvas sampler2D \n"
"#define Color vec4 \n"
+ "#define Texel texture2D \n"
"#define extern uniform \n"
- "uniform Image _tex0_; \n"
+ "uniform Image _tex0_; \n"
"%s \n"
"void main(){ \n"
"gl_FragColor = effect(gl_Color, _tex0_, gl_TexCoord[0].xy, gl_FragCoord.xy);\n"
@@ -33,13 +34,13 @@ namespace render
destroy();
}
- void JSLProgram::destroy()
+ inline void JSLProgram::destroy()
{
if (currentJSLProgram == this)
unuse();
}
- void JSLProgram::initialize(const char* program)
+ inline void JSLProgram::initialize(const char* program)
{
if (maxTextureUnits == -1)
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureUnits);