1 files changed, 34 insertions, 1 deletions

diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp
index 65d4b63bb9..3bf5baec14 100644
--- a/drivers/gles2/shader_gles2.cpp
+++ b/drivers/gles2/shader_gles2.cpp
@@ -229,6 +229,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 			glDeleteShader(v.vert_id);
 			glDeleteShader(v.frag_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 		}
 	}
@@ -242,6 +243,11 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 	strings.push_back("#define USE_GLES_OVER_GL\n");
 #else
 	strings.push_back("#version 100\n");
+//angle does not like
+#ifdef JAVASCRIPT_ENABLED
+	strings.push_back("#define USE_HIGHP_PRECISION\n");
+#endif
+
 #endif
 
 	int define_line_ofs = 1;
@@ -323,6 +329,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 		if (iloglen < 0) {
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 
 			ERR_PRINT("No OpenGL vertex shader compiler log. What the frick?");
@@ -344,6 +351,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 			Memory::free_static(ilogmem);
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 		}
 
@@ -398,6 +406,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 			glDeleteShader(v.frag_id);
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 
 			ERR_PRINT("No OpenGL fragment shader compiler log. What the frick?");
@@ -420,6 +429,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 			glDeleteShader(v.frag_id);
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 		}
 
@@ -447,6 +457,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 			glDeleteShader(v.frag_id);
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
+			memdelete_arr(v.uniform_location);
 			v.id = 0;
 
 			ERR_PRINT("No OpenGL program link log. What the frick?");
@@ -471,6 +482,7 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 		glDeleteShader(v.frag_id);
 		glDeleteShader(v.vert_id);
 		glDeleteProgram(v.id);
+		memdelete_arr(v.uniform_location);
 		v.id = 0;
 
 		ERR_FAIL_V(NULL);
@@ -514,6 +526,10 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
 	glUseProgram(0);
 	v.ok = true;
 
+	if (cc) {
+		cc->versions.insert(conditional_version.version);
+	}
+
 	return &v;
 }
 
@@ -678,9 +694,26 @@ void ShaderGLES2::set_custom_shader(uint32_t p_code_id) {
 }
 
 void ShaderGLES2::free_custom_shader(uint32_t p_code_id) {
+
 	ERR_FAIL_COND(!custom_code_map.has(p_code_id));
 	if (conditional_version.code_version == p_code_id)
-		conditional_version.code_version = 0;
+		conditional_version.code_version = 0; //do not keep using a version that is going away
+
+	VersionKey key;
+	key.code_version = p_code_id;
+	for (Set<uint32_t>::Element *E = custom_code_map[p_code_id].versions.front(); E; E = E->next()) {
+		key.version = E->get();
+		ERR_CONTINUE(!version_map.has(key));
+		Version &v = version_map[key];
+
+		glDeleteShader(v.vert_id);
+		glDeleteShader(v.frag_id);
+		glDeleteProgram(v.id);
+		memdelete_arr(v.uniform_location);
+		v.id = 0;
+
+		version_map.erase(key);
+	}
 
 	custom_code_map.erase(p_code_id);
 }