diff options
| author | Joshua Reisenauer <kd7tck@msn.com> | 2016-05-16 19:54:03 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <kd7tck@msn.com> | 2016-05-16 19:54:03 -0700 |
| commit | cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc (patch) | |
| tree | 1b93a694de0babedbf23f884e75a098eca210c52 /examples/resources | |
| parent | 706755d1464bd65623755c6c2b4df931a37e9eb5 (diff) | |
| parent | 0e29aa2951fe11e9d0fabec2182ed6309fce37bb (diff) | |
| download | raylib-cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc.tar.gz raylib-cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'examples/resources')
| -rw-r--r-- | examples/resources/shaders/glsl330/bloom.fs | 2 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl330/swirl.fs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/resources/shaders/glsl330/bloom.fs b/examples/resources/shaders/glsl330/bloom.fs index c8cb0d32..47ddee30 100644 --- a/examples/resources/shaders/glsl330/bloom.fs +++ b/examples/resources/shaders/glsl330/bloom.fs @@ -22,7 +22,7 @@ void main() { for (int j = -3; j < 3; j++) { - sum += texture2D(texture0, fragTexCoord + vec2(j, i)*0.004)*0.25; + sum += texture(texture0, fragTexCoord + vec2(j, i)*0.004)*0.25; } } diff --git a/examples/resources/shaders/glsl330/swirl.fs b/examples/resources/shaders/glsl330/swirl.fs index b1dc82f0..da098754 100644 --- a/examples/resources/shaders/glsl330/swirl.fs +++ b/examples/resources/shaders/glsl330/swirl.fs @@ -40,7 +40,7 @@ void main (void) } tc += center; - vec3 color = texture2D(texture0, tc/texSize).rgb; + vec3 color = texture(texture0, tc/texSize).rgb; finalColor = vec4(color, 1.0);; }
\ No newline at end of file |