ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forget a shader + remove shader output

Browse Source
This commit is contained in:
Vincent Lejeune 2014-08-02 00:56:36 +02:00
parent 58c094917e
commit 09d0c2eef5
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/shaders/utils/getLightFactor.frag
View File

@ -2,24 +2,6 @@ uniform sampler2D DiffuseMap;
uniform sampler2D SpecularMap; uniform sampler2D SpecularMap;
uniform sampler2D SSAO; uniform sampler2D SSAO;
#ifdef UBO_DISABLED
uniform mat4 ViewMatrix;
uniform mat4 ProjectionMatrix;
uniform mat4 InverseViewMatrix;
uniform mat4 InverseProjectionMatrix;
uniform vec2 screen;
#else
layout (std140) uniform MatrixesData
{
mat4 ViewMatrix;
mat4 ProjectionMatrix;
mat4 InverseViewMatrix;
mat4 InverseProjectionMatrix;
mat4 ShadowViewProjMatrixes[4];
vec2 screen;
};
#endif
vec3 getLightFactor(float specMapValue) vec3 getLightFactor(float specMapValue)
{ {
vec2 tc = gl_FragCoord.xy / screen; vec2 tc = gl_FragCoord.xy / screen;

1
src/graphics/glwrap.cpp
View File

@ -301,7 +301,6 @@ GLuint LoadShader(const char * file, unsigned type)
ErrorMessage[0]=0; ErrorMessage[0]=0;
glGetShaderInfoLog(Id, InfoLogLength, NULL, ErrorMessage); glGetShaderInfoLog(Id, InfoLogLength, NULL, ErrorMessage);
Log::error("GLWrap", ErrorMessage); Log::error("GLWrap", ErrorMessage);
Log::error("GLWrap", Code.c_str());
delete[] ErrorMessage; delete[] ErrorMessage;
} }