diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2018-08-23 17:11:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 17:11:00 +0200 |
| commit | d61fc6a97b45d2147d0ba43c0ec572d566aad6e6 (patch) | |
| tree | 7bbcadc028c7354b0fbe38102b0bf794d68332e6 /drivers/gles2/shaders | |
| parent | 29ccd2be18dd900957975160cb58bb79dc6fc0ea (diff) | |
| parent | da876907fd0ee7fed0718e933100182f5fe5abfe (diff) | |
Merge pull request #21317 from karroffel/gles2-canvas-texture-sampler-long-branch-name
[GLES2] fix canvas_item sampler allocation
Diffstat (limited to 'drivers/gles2/shaders')
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 29d81bb2c4..e97822f9bf 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -96,9 +96,9 @@ precision mediump float; precision mediump int; #endif -uniform sampler2D color_texture; // texunit:0 +uniform sampler2D color_texture; // texunit:-1 uniform highp vec2 color_texpixel_size; -uniform mediump sampler2D normal_texture; // texunit:1 +uniform mediump sampler2D normal_texture; // texunit:-2 varying mediump vec2 uv_interp; varying mediump vec4 color_interp; @@ -109,7 +109,7 @@ uniform vec4 final_modulate; #ifdef SCREEN_TEXTURE_USED -uniform sampler2D screen_texture; // texunit:2 +uniform sampler2D screen_texture; // texunit:-3 #endif |