Add clipping, backbuffer, and CanvasGroups to 2D GLES3 renderer

As well as significant consequent cleanup in the RenderTarget, Texture, and Canvas renderer code

1 files changed, 18 insertions, 163 deletions

diff --git a/drivers/gles3/shaders/copy.glsl b/drivers/gles3/shaders/copy.glsl
index 62332a15a7..ca2fc7e36d 100644
--- a/drivers/gles3/shaders/copy.glsl
+++ b/drivers/gles3/shaders/copy.glsl
@@ -1,204 +1,59 @@
 /* clang-format off */
 #[modes]
 
-mode_default =
-mode_cubemap = #define USE_CUBEMAP
-mode_panorama = #define USE_PANORAMA
+mode_default = #define MODE_SIMPLE_COPY
 mode_copy_section = #define USE_COPY_SECTION
-mode_asym_pano = #define USE_ASYM_PANO
-mode_no_alpha = #define USE_NO_ALPHA
-mode_custom_alpha = #define USE_CUSTOM_ALPHA
-mode_multiplier = #define USE_MULTIPLIER
-mode_sep_cbcr_texture = #define USE_SEP_CBCR_TEXTURE
-mode_ycbcr_to_rgb = #define USE_YCBCR_TO_RGB
+mode_gaussian_blur = #define MODE_GAUSSIAN_BLUR
+mode_mipmap = #define MODE_MIPMAP
+mode_simple_color = #define MODE_SIMPLE_COLOR \n#define USE_COPY_SECTION
 
 #[specializations]
 
-
 #[vertex]
 
-#ifdef USE_GLES_OVER_GL
-#define lowp
-#define mediump
-#define highp
-#else
-precision highp float;
-precision highp int;
-#endif
-
-layout(location = 0) in highp vec4 vertex_attrib;
-/* clang-format on */
-
-#if defined(USE_CUBEMAP) || defined(USE_PANORAMA)
-layout(location = 4) in vec3 cube_in;
-#else
-layout(location = 4) in vec2 uv_in;
-#endif
-
-layout(location = 5) in vec2 uv2_in;
+layout(location = 0) in vec2 vertex_attrib;
 
-#if defined(USE_CUBEMAP) || defined(USE_PANORAMA)
-out vec3 cube_interp;
-#else
 out vec2 uv_interp;
-#endif
-out vec2 uv2_interp;
+/* clang-format on */
 
 #ifdef USE_COPY_SECTION
 uniform highp vec4 copy_section;
-#elif defined(USE_DISPLAY_TRANSFORM)
-uniform highp mat4 display_transform;
 #endif
 
 void main() {
-#if defined(USE_CUBEMAP) || defined(USE_PANORAMA)
-	cube_interp = cube_in;
-#elif defined(USE_ASYM_PANO)
-	uv_interp = vertex_attrib.xy;
-#else
-	uv_interp = uv_in;
-#endif
-
-	uv2_interp = uv2_in;
-	gl_Position = vertex_attrib;
+	uv_interp = vertex_attrib * 0.5 + 0.5;
+	gl_Position = vec4(vertex_attrib, 1.0, 1.0);
 
 #ifdef USE_COPY_SECTION
+	gl_Position.xy = (copy_section.xy + (uv_interp.xy * 0.5 + 0.5) * copy_section.zw) * 2.0 - 1.0;
 	uv_interp = copy_section.xy + uv_interp * copy_section.zw;
-	gl_Position.xy = (copy_section.xy + (gl_Position.xy * 0.5 + 0.5) * copy_section.zw) * 2.0 - 1.0;
-#elif defined(USE_DISPLAY_TRANSFORM)
-	uv_interp = (display_transform * vec4(uv_in, 1.0, 1.0)).xy;
 #endif
 }
 
 /* clang-format off */
 #[fragment]
 
-#define M_PI 3.14159265359
-
-#ifdef USE_GLES_OVER_GL
-#define lowp
-#define mediump
-#define highp
-#else
-#if defined(USE_HIGHP_PRECISION)
-precision highp float;
-precision highp int;
-#else
-precision mediump float;
-precision mediump int;
-#endif
-#endif
-
-#if defined(USE_CUBEMAP) || defined(USE_PANORAMA)
-in vec3 cube_interp;
-#else
 in vec2 uv_interp;
-#endif
 /* clang-format on */
-
-#ifdef USE_ASYM_PANO
-uniform highp mat4 pano_transform;
-uniform highp vec4 asym_proj;
-#endif
-
-#ifdef USE_CUBEMAP
-uniform samplerCube source_cube; // texunit:0
-#else
-uniform sampler2D source; // texunit:0
-#endif
-
-#ifdef USE_SEP_CBCR_TEXTURE
-uniform sampler2D CbCr; //texunit:1
-#endif
-
-in vec2 uv2_interp;
-
-#ifdef USE_MULTIPLIER
-uniform float multiplier;
+#ifdef MODE_SIMPLE_COLOR
+uniform vec4 color_in;
 #endif
 
-#ifdef USE_CUSTOM_ALPHA
-uniform float custom_alpha;
+#ifdef MODE_GAUSSIAN_BLUR
+uniform highp vec2 pixel_size;
 #endif
 
-#if defined(USE_PANORAMA) || defined(USE_ASYM_PANO)
-uniform highp mat4 sky_transform;
-
-vec4 texturePanorama(sampler2D pano, vec3 normal) {
-	vec2 st = vec2(
-			atan(normal.x, normal.z),
-			acos(normal.y));
-
-	if (st.x < 0.0)
-		st.x += M_PI * 2.0;
-
-	st /= vec2(M_PI * 2.0, M_PI);
-
-	return texture(pano, st);
-}
-
-#endif
+uniform sampler2D source; // texunit:0
 
 layout(location = 0) out vec4 frag_color;
 
 void main() {
-#ifdef USE_PANORAMA
-
-	vec3 cube_normal = normalize(cube_interp);
-	cube_normal.z = -cube_normal.z;
-	cube_normal = mat3(sky_transform) * cube_normal;
-	cube_normal.z = -cube_normal.z;
-
-	vec4 color = texturePanorama(source, cube_normal);
-
-#elif defined(USE_ASYM_PANO)
-
-	// When an asymmetrical projection matrix is used (applicable for stereoscopic rendering i.e. VR) we need to do this calculation per fragment to get a perspective correct result.
-	// Asymmetrical projection means the center of projection is no longer in the center of the screen but shifted.
-	// The Matrix[2][0] (= asym_proj.x) and Matrix[2][1] (= asym_proj.z) values are what provide the right shift in the image.
-
-	vec3 cube_normal;
-	cube_normal.z = -1.0;
-	cube_normal.x = (cube_normal.z * (-uv_interp.x - asym_proj.x)) / asym_proj.y;
-	cube_normal.y = (cube_normal.z * (-uv_interp.y - asym_proj.z)) / asym_proj.a;
-	cube_normal = mat3(sky_transform) * mat3(pano_transform) * cube_normal;
-	cube_normal.z = -cube_normal.z;
-
-	vec4 color = texturePanorama(source, normalize(cube_normal.xyz));
-
-#elif defined(USE_CUBEMAP)
-	vec4 color = texture(source_cube, normalize(cube_interp));
-#elif defined(USE_SEP_CBCR_TEXTURE)
-	vec4 color;
-	color.r = texture(source, uv_interp).r;
-	color.gb = texture(CbCr, uv_interp).rg - vec2(0.5, 0.5);
-	color.a = 1.0;
-#else
+#ifdef MODE_SIMPLE_COPY
 	vec4 color = texture(source, uv_interp);
+	frag_color = color;
 #endif
 
-#ifdef USE_YCBCR_TO_RGB
-	// YCbCr -> RGB conversion
-
-	// Using BT.601, which is the standard for SDTV is provided as a reference
-	color.rgb = mat3(
-						vec3(1.00000, 1.00000, 1.00000),
-						vec3(0.00000, -0.34413, 1.77200),
-						vec3(1.40200, -0.71414, 0.00000)) *
-			color.rgb;
-#endif
-
-#ifdef USE_NO_ALPHA
-	color.a = 1.0;
-#endif
-
-#ifdef USE_CUSTOM_ALPHA
-	color.a = custom_alpha;
-#endif
-
-#ifdef USE_MULTIPLIER
-	color.rgb *= multiplier;
+#ifdef MODE_SIMPLE_COLOR
+	frag_color = color_in;
 #endif
-
-	frag_color = color;
 }