diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:49:26 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:49:26 -0300 |
| commit | 2ef5a342e34df3863ac512bb3673eba28f15e9f4 (patch) | |
| tree | edb5abbc25afce7fb23d704070d43968cf4d9b33 /drivers/gles2/shaders | |
| parent | 30d36581100f0bf71c6d2502be9a03443bdf8708 (diff) | |
-begin work on unidirectional collision detection
-fixed performance issue in new 2D engine
-texscreen() working in shader 2D
Diffstat (limited to 'drivers/gles2/shaders')
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 1 | ||||
| -rw-r--r-- | drivers/gles2/shaders/material.glsl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 4ec601f0fc..464cb9e188 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -100,6 +100,7 @@ uniform vec2 screen_uv_mult; #if defined(ENABLE_TEXSCREEN) uniform vec2 texscreen_screen_mult; +uniform vec4 texscreen_screen_clamp; uniform sampler2D texscreen_tex; #endif diff --git a/drivers/gles2/shaders/material.glsl b/drivers/gles2/shaders/material.glsl index 718dd56249..38fb03ab5c 100644 --- a/drivers/gles2/shaders/material.glsl +++ b/drivers/gles2/shaders/material.glsl @@ -779,6 +779,7 @@ uniform highp mat4 camera_inverse_transform; #if defined(ENABLE_TEXSCREEN) uniform vec2 texscreen_screen_mult; +uniform vec4 texscreen_screen_clamp; uniform sampler2D texscreen_tex; #endif |