diff options
| author | Ray <raysan5@gmail.com> | 2016-07-19 12:48:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 12:48:55 +0200 |
| commit | ab0d19f356dc6aadff11ab4034880c8759315000 (patch) | |
| tree | fcd102935dcbd0d007fc413e8e97ba9c4fd90701 /shaders/glsl330/bloom.fs | |
| parent | 13e18c23edb668e40d07c100fd1652c9c0af300b (diff) | |
| parent | c482f37dfde9343ee1cc315153dcef80254c7a0b (diff) | |
| download | raylib-ab0d19f356dc6aadff11ab4034880c8759315000.tar.gz raylib-ab0d19f356dc6aadff11ab4034880c8759315000.zip | |
Merge pull request #137 from raysan5/develop1.5.0
Integrate Develop branch
Diffstat (limited to 'shaders/glsl330/bloom.fs')
| -rw-r--r-- | shaders/glsl330/bloom.fs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shaders/glsl330/bloom.fs b/shaders/glsl330/bloom.fs index 0307bc06..102e6605 100644 --- a/shaders/glsl330/bloom.fs +++ b/shaders/glsl330/bloom.fs @@ -6,7 +6,7 @@ in vec4 fragColor; // Input uniform values uniform sampler2D texture0; -uniform vec4 fragTintColor; +uniform vec4 colDiffuse; // Output fragment color out vec4 finalColor; |