diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-29 10:16:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 10:16:28 +0100 |
| commit | eb20d9055d3b49fcceca97667fbcf608b5bf250f (patch) | |
| tree | 4607fe07b227ece9577fba156009d2463dbdc9cd /drivers | |
| parent | 019760d611b6a06ce8d65e7ae23c1546c14466d6 (diff) | |
| parent | 11815a23dca57e79e82d3f944fe563ee8ca824d6 (diff) | |
Merge pull request #23339 from RandomShaper/fix-gles2-canvas-inconsistency
Fix GLES2 automatic texture lookup in canvas
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index b990384949..79d4eb2243 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -148,7 +148,10 @@ void main() { vec4 color = color_interp; +#if !defined(COLOR_USED) + //default behavior, texture by color color *= texture2D(color_texture, uv_interp); +#endif #ifdef SCREEN_UV_USED vec2 screen_uv = gl_FragCoord.xy * screen_pixel_size; |