diff options
| author | Anthony Pesch <inolen@gmail.com> | 2014-01-11 17:42:02 -0800 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2015-03-17 11:37:26 +0000 |
| commit | 1651396c4176a6861bdbc8b2c361dc4e4f41c241 (patch) | |
| tree | 32a3d641ea3afa1cd85593eb6b02bc14118f982a /src/renderergl2/glsl | |
| parent | e5ccbe44258411a4cdbe05951a58dd575b800056 (diff) | |
fixed formatting of a few GLSL float constants remove unneeded version number from texturecolor shader call GLSL_VertexAttribPointers after attribute arrays have been enabled
Diffstat (limited to 'src/renderergl2/glsl')
| -rw-r--r-- | src/renderergl2/glsl/lightall_fp.glsl | 2 | ||||
| -rw-r--r-- | src/renderergl2/glsl/texturecolor_fp.glsl | 2 | ||||
| -rw-r--r-- | src/renderergl2/glsl/texturecolor_vp.glsl | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/renderergl2/glsl/lightall_fp.glsl b/src/renderergl2/glsl/lightall_fp.glsl index 7c62d664..f2da7821 100644 --- a/src/renderergl2/glsl/lightall_fp.glsl +++ b/src/renderergl2/glsl/lightall_fp.glsl @@ -164,7 +164,7 @@ vec3 EnvironmentBRDF(float gloss, float NE, vec3 specular) { #if 1 // from http://blog.selfshadow.com/publications/s2013-shading-course/lazarov/s2013_pbs_black_ops_2_notes.pdf - vec4 t = vec4( 1/0.96, 0.475, (0.0275 - 0.25 * 0.04)/0.96,0.25 ) * gloss; + vec4 t = vec4( 1.0/0.96, 0.475, (0.0275 - 0.25 * 0.04)/0.96,0.25 ) * gloss; t += vec4( 0.0, 0.0, (0.015 - 0.75 * 0.04)/0.96,0.75 ); float a0 = t.x * min( t.y, exp2( -9.28 * NE ) ) + t.z; float a1 = t.w; diff --git a/src/renderergl2/glsl/texturecolor_fp.glsl b/src/renderergl2/glsl/texturecolor_fp.glsl index e077e7da..7c9046e1 100644 --- a/src/renderergl2/glsl/texturecolor_fp.glsl +++ b/src/renderergl2/glsl/texturecolor_fp.glsl @@ -1,5 +1,3 @@ -#version 120 - uniform sampler2D u_DiffuseMap; uniform vec4 u_Color; diff --git a/src/renderergl2/glsl/texturecolor_vp.glsl b/src/renderergl2/glsl/texturecolor_vp.glsl index 7a5750a5..552cd938 100644 --- a/src/renderergl2/glsl/texturecolor_vp.glsl +++ b/src/renderergl2/glsl/texturecolor_vp.glsl @@ -1,5 +1,3 @@ -#version 120 - attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; |