diff options
| author | Ray <raysan5@gmail.com> | 2016-06-10 08:58:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 08:58:37 +0200 |
| commit | 296378299259c86af58d5bda5d4654680ef87f08 (patch) | |
| tree | 5d5b4ca2dc079b74c9228b8f1174b7e54891fe1b /examples | |
| parent | fb9047735465537d97c78fdf56bccf7b74ba0bb7 (diff) | |
| parent | 77f599885dade4930fb01baca22db6e2ae0c9f20 (diff) | |
| download | raylib-296378299259c86af58d5bda5d4654680ef87f08.tar.gz raylib-296378299259c86af58d5bda5d4654680ef87f08.zip | |
Merge pull request #128 from victorfisac/develop
Adapted shaders for OpenGL ES 2.0
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/resources/shaders/glsl100/bloom.fs | 2 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl100/grayscale.fs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/resources/shaders/glsl100/bloom.fs b/examples/resources/shaders/glsl100/bloom.fs index 280d2fb6..128736f2 100644 --- a/examples/resources/shaders/glsl100/bloom.fs +++ b/examples/resources/shaders/glsl100/bloom.fs @@ -26,7 +26,7 @@ void main() } // Texel color fetching from texture sampler - vec4 texelColor = texture(texture0, fragTexCoord); + vec4 texelColor = texture2D(texture0, fragTexCoord); // Calculate final fragment color if (texelColor.r < 0.3) tc = sum*sum*0.012 + texelColor; diff --git a/examples/resources/shaders/glsl100/grayscale.fs b/examples/resources/shaders/glsl100/grayscale.fs index f92ec335..cf857488 100644 --- a/examples/resources/shaders/glsl100/grayscale.fs +++ b/examples/resources/shaders/glsl100/grayscale.fs @@ -15,7 +15,7 @@ uniform vec4 fragTintColor; void main() { // Texel color fetching from texture sampler - vec4 texelColor = texture(texture0, fragTexCoord)*fragTintColor*fragColor; + vec4 texelColor = texture2D(texture0, fragTexCoord)*fragTintColor*fragColor; // Convert texel color to grayscale using NTSC conversion weights float gray = dot(texelColor.rgb, vec3(0.299, 0.587, 0.114)); |