aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Shader.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-09-07 13:30:44 +0800
committerchai <chaifix@163.com>2018-09-07 13:30:44 +0800
commite72188433348c270a54879da9f086f1b527b580f (patch)
treeb2cb92b37579c6f9cff77f52fc591426eb2d8286 /src/libjin/Graphics/Shader.cpp
parent28ca1f570d417671904a25c2a9c589fdb1eb7a03 (diff)
*update
Diffstat (limited to 'src/libjin/Graphics/Shader.cpp')
-rw-r--r--src/libjin/Graphics/Shader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libjin/Graphics/Shader.cpp b/src/libjin/Graphics/Shader.cpp
index 13e259d..f078648 100644
--- a/src/libjin/Graphics/Shader.cpp
+++ b/src/libjin/Graphics/Shader.cpp
@@ -33,7 +33,7 @@ namespace graphics
* it clear to anybody reading your code that you really mean to sample from
* texture unit 0, and did not just forget to set the value.
*/
- const int DEFAULT_TEX_UNIT = 0;
+ const int DEFAULT_TEXTURE_UNIT = 0;
/*static*/ JSLProgram* JSLProgram::currentJSLProgram = nullptr;
@@ -43,7 +43,7 @@ namespace graphics
}
JSLProgram::JSLProgram(const char* program)
- : currentTextureUnit(DEFAULT_TEX_UNIT)
+ : currentTextureUnit(DEFAULT_TEXTURE_UNIT)
{
char* fs = (char*)calloc(1, strlen(program) + SHADER_FORMAT_SIZE);
formatShader(fs, program);
@@ -84,8 +84,8 @@ namespace graphics
void JSLProgram::bindDefaultTexture()
{
- int loc = glGetUniformLocation(pid, default_tex);
- glUniform1i(loc, DEFAULT_TEX_UNIT);
+ int loc = glGetUniformLocation(pid, default_texture);
+ glUniform1i(loc, DEFAULT_TEXTURE_UNIT);
}
GLint JSLProgram::claimTextureUnit(const std::string& name)