Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

.gitignore

@@ -8,6 +8,7 @@ platform/osx/logo.h
 platform/windows/logo.h
 platform/x11/logo.h
 drivers/gles2/shaders/*.h
+drivers/gles3/shaders/*.h
 modules/register_module_types.cpp
 core/version.h
 core/method_bind.inc

SConstruct

@@ -348,6 +348,9 @@ if selected_platform in platform_list:
 
     if (env['verbose'] == 'no'):
         methods.no_verbose(sys, env)
+
+    if (True): # FIXME: detect GLES3
+        env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
 
     Export('env')
 

bin/tests/test_gui.cpp

@@ -370,7 +370,7 @@ class TestMainLoop : public SceneTree {
 		tabc->set_size( Point2( 180,250 ) );
 
 
-		Ref<ImageTexture> text = memnew( ImageTexture );
+		/*Ref<ImageTexture> text = memnew( ImageTexture );
 		text->load("test_data/concave.png");
 
 		Sprite* sprite = memnew(Sprite);
@@ -383,7 +383,7 @@ class TestMainLoop : public SceneTree {
 		sprite->set_texture(text);
 		sprite->add_child(sprite2);
 		sprite2->set_pos(Point2(50, 50));
-		sprite2->show();
+		sprite2->show();*/
 	}
 
 

bin/tests/test_main.cpp

@@ -37,13 +37,10 @@
 #include "test_gui.h"
 #include "test_render.h"
 #include "test_sound.h"
-#include "test_misc.h"
 #include "test_physics.h"
 #include "test_physics_2d.h"
-#include "test_python.h"
+
 #include "test_io.h"
-#include "test_particles.h"
-#include "test_detailer.h"
 #include "test_shader_lang.h"
 #include "test_gdscript.h"
 #include "test_image.h"
@@ -56,7 +53,6 @@ const char ** tests_get_names()  {
 		"containers",
 		"math",
 		"render",
-		"particles",
 		"multimesh",
 		"gui",
 		"io",
@@ -96,11 +92,6 @@ MainLoop* test_main(String p_test,const List<String>& p_args) {
 		return TestPhysics2D::test();
 	}
 
-  	if (p_test=="misc") {
-
-		return TestMisc::test();
-	}
-
 	if (p_test=="render") {
 
 		return TestRender::test();
@@ -123,16 +114,6 @@ MainLoop* test_main(String p_test,const List<String>& p_args) {
 		return TestIO::test();
 	}
 
-	if (p_test=="particles") {
-
-		return TestParticles::test();
-	}
-
-	if (p_test=="multimesh") {
-
-		return TestMultiMesh::test();
-	}
-
 	if (p_test=="shaderlang") {
 
 		return TestShaderLang::test();
@@ -163,19 +144,6 @@ MainLoop* test_main(String p_test,const List<String>& p_args) {
 		return TestImage::test();
 	}
 
-	if (p_test=="detailer") {
-
-		return TestMultiMesh::test();
-	}
-
-#ifdef PYTHON_ENABLED
-
-	if (p_test=="python") {
-
-		return TestPython::test();
-	}
-#endif
-
 	return NULL;
 }