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/glsl100/pixel.fs | |
| parent | 13e18c23edb668e40d07c100fd1652c9c0af300b (diff) | |
| parent | c482f37dfde9343ee1cc315153dcef80254c7a0b (diff) | |
| download | raylib-1.5.0.tar.gz raylib-1.5.0.zip | |
Merge pull request #137 from raysan5/develop1.5.0
Integrate Develop branch
Diffstat (limited to 'shaders/glsl100/pixel.fs')
| -rw-r--r-- | shaders/glsl100/pixel.fs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shaders/glsl100/pixel.fs b/shaders/glsl100/pixel.fs index c532f219..41ba3ed6 100644 --- a/shaders/glsl100/pixel.fs +++ b/shaders/glsl100/pixel.fs @@ -8,12 +8,13 @@ varying vec4 fragColor; // Input uniform values uniform sampler2D texture0; -uniform vec4 fragTintColor; +uniform vec4 colDiffuse; // NOTE: Add here your custom variables -const float renderWidth = 1280; -const float renderHeight = 720; +// NOTE: Render size values must be passed from code +const float renderWidth = 800; +const float renderHeight = 450; uniform float pixelWidth = 5.0f; uniform float pixelHeight = 5.0f; |