aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Shader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/Graphics/Shader.cpp')
-rw-r--r--src/libjin/Graphics/Shader.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/libjin/Graphics/Shader.cpp b/src/libjin/Graphics/Shader.cpp
index a45fcf0..688fa51 100644
--- a/src/libjin/Graphics/Shader.cpp
+++ b/src/libjin/Graphics/Shader.cpp
@@ -21,15 +21,8 @@ namespace graphics
* SHADER_FORMAT_SIZE
* formatShader
*/
- #include "Shaders/base.shader.h"
#include "Shaders/default.shader.h"
- const char* Shader::SHADER_PROJECTION_MATRIX = "jin_ProjectionMatrix";
- const char* Shader::SHADER_MODEL_MATRIX = "jin_ModelMatrix";
- const char* Shader::SHADER_MAIN_TEXTURE = "jin_MainTexture";
- const char* Shader::SHADER_VERTEX_COORDS = "jin_VertexCoords";
- const char* Shader::SHADER_TEXTURE_COORDS = "jin_TextureCoords";
-
/**
* https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
* The default value of a sampler variable is 0. From the GLSL 3.30 spec,
@@ -140,7 +133,7 @@ namespace graphics
{
glUseProgram(pid);
currentShader = this;
- sendInt(Shader::SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT);
+ sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT);
}
/*static*/ void Shader::unuse()