diff options
Diffstat (limited to 'src/libjin/Graphics/Shader')
| -rw-r--r-- | src/libjin/Graphics/Shader/je_shader.cpp | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Shader/shaders/je_default.shader.h (renamed from src/libjin/Graphics/Shader/je_default.shader.h) | 0 | ||||
| -rw-r--r-- | src/libjin/Graphics/Shader/shaders/je_font.shader.h (renamed from src/libjin/Graphics/Shader/je_font.shader.h) | 0 | ||||
| -rw-r--r-- | src/libjin/Graphics/Shader/shaders/je_texture.shader.h (renamed from src/libjin/Graphics/Shader/je_texture.shader.h) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp index b0e7506..e6f82a4 100644 --- a/src/libjin/Graphics/Shader/je_shader.cpp +++ b/src/libjin/Graphics/Shader/je_shader.cpp @@ -196,7 +196,7 @@ if (success == GL_FALSE) \ } gl.activeTexUnit(unit); glUniform1i(location, unit); - gl.bindTexture(tex->getTexture()); + gl.bindTexture(tex->getGLTexture()); gl.activeTexUnit(0); } @@ -214,7 +214,7 @@ if (success == GL_FALSE) \ } glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0 + unit); - gl.bindTexture(canvas->getTexture()); + gl.bindTexture(canvas->getGLTexture()); glActiveTexture(GL_TEXTURE0); } diff --git a/src/libjin/Graphics/Shader/je_default.shader.h b/src/libjin/Graphics/Shader/shaders/je_default.shader.h index 3f57c44..3f57c44 100644 --- a/src/libjin/Graphics/Shader/je_default.shader.h +++ b/src/libjin/Graphics/Shader/shaders/je_default.shader.h diff --git a/src/libjin/Graphics/Shader/je_font.shader.h b/src/libjin/Graphics/Shader/shaders/je_font.shader.h index e04c225..e04c225 100644 --- a/src/libjin/Graphics/Shader/je_font.shader.h +++ b/src/libjin/Graphics/Shader/shaders/je_font.shader.h diff --git a/src/libjin/Graphics/Shader/je_texture.shader.h b/src/libjin/Graphics/Shader/shaders/je_texture.shader.h index d1fc86f..d1fc86f 100644 --- a/src/libjin/Graphics/Shader/je_texture.shader.h +++ b/src/libjin/Graphics/Shader/shaders/je_texture.shader.h |