From 1527cf8c0d17891dd0ebf99d484f83daa46eba3c Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 10 Oct 2016 18:31:01 -0300
Subject: 2D Shaders are working again using the new syntax, though all is
 buggy in general

---
 drivers/gles3/shader_compiler_gles3.h | 67 +++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 drivers/gles3/shader_compiler_gles3.h

(limited to 'drivers/gles3/shader_compiler_gles3.h')

diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h
new file mode 100644
index 0000000000..ad51b99927
--- /dev/null
+++ b/drivers/gles3/shader_compiler_gles3.h
@@ -0,0 +1,67 @@
+#ifndef SHADERCOMPILERGLES3_H
+#define SHADERCOMPILERGLES3_H
+
+#include "servers/visual/shader_language.h"
+#include "servers/visual/shader_types.h"
+#include "servers/visual_server.h"
+#include "pair.h"
+
+class ShaderCompilerGLES3 {
+public:
+	struct IdentifierActions {
+
+		Map<StringName,Pair<int*,int> > render_mode_values;
+		Map<StringName,bool*> render_mode_flags;
+		Map<StringName,bool*> usage_flag_pointers;
+
+		Map<StringName,ShaderLanguage::ShaderNode::Uniform> *uniforms;
+	};
+
+	struct GeneratedCode {
+
+		Vector<CharString> defines;
+		Vector<StringName> texture_uniforms;
+		Vector<uint32_t> uniform_offsets;
+		uint32_t uniform_total_size;
+		String uniforms;
+		String vertex_global;
+		String vertex;
+		String fragment_global;
+		String fragment;
+		String light;
+
+	};
+
+private:
+
+	ShaderLanguage parser;
+
+	struct DefaultIdentifierActions {
+
+		Map<StringName,String> renames;
+		Map<StringName,String> render_mode_defines;
+		Map<StringName,String> usage_defines;
+	};
+
+	void _dump_function_deps(ShaderLanguage::ShaderNode *p_node, const StringName& p_for_func, const Map<StringName, String> &p_func_code, String& r_to_add,Set<StringName> &added);
+	String _dump_node_code(ShaderLanguage::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions& p_actions, const DefaultIdentifierActions& p_default_actions);
+
+
+
+	Set<StringName> used_name_defines;
+	Set<StringName> used_rmode_defines;
+	Set<StringName> internal_functions;
+
+
+	DefaultIdentifierActions actions[VS::SHADER_MAX];
+
+public:
+
+
+	Error compile(VS::ShaderMode p_mode, const String& p_code, IdentifierActions* p_actions, const String& p_path, GeneratedCode& r_gen_code);
+
+
+	ShaderCompilerGLES3();
+};
+
+#endif // SHADERCOMPILERGLES3_H
-- 
cgit v1.2.3


From d6567010bf1c65abcbe09b959cde63664778d923 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sat, 29 Oct 2016 20:48:09 -0300
Subject: -Many many fixes -Gizmos work again

---
 drivers/gles3/shader_compiler_gles3.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'drivers/gles3/shader_compiler_gles3.h')

diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h
index ad51b99927..dcea82d773 100644
--- a/drivers/gles3/shader_compiler_gles3.h
+++ b/drivers/gles3/shader_compiler_gles3.h
@@ -21,6 +21,8 @@ public:
 
 		Vector<CharString> defines;
 		Vector<StringName> texture_uniforms;
+		Vector<ShaderLanguage::ShaderNode::Uniform::Hint> texture_hints;
+
 		Vector<uint32_t> uniform_offsets;
 		uint32_t uniform_total_size;
 		String uniforms;
-- 
cgit v1.2.3


From cacf9ebb7fd8df8845daca9da2fe55456cc179aa Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Wed, 9 Nov 2016 23:55:06 -0300
Subject: all light types and shadows are working, pending a lot of clean-up

---
 drivers/gles3/shader_compiler_gles3.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'drivers/gles3/shader_compiler_gles3.h')

diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h
index dcea82d773..3549526808 100644
--- a/drivers/gles3/shader_compiler_gles3.h
+++ b/drivers/gles3/shader_compiler_gles3.h
@@ -32,6 +32,9 @@ public:
 		String fragment;
 		String light;
 
+		bool uses_fragment_time;
+		bool uses_vertex_time;
+
 	};
 
 private:
@@ -49,6 +52,10 @@ private:
 	String _dump_node_code(ShaderLanguage::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions& p_actions, const DefaultIdentifierActions& p_default_actions);
 
 
+	StringName current_func_name;
+	StringName vertex_name;
+	StringName fragment_name;
+	StringName time_name;
 
 	Set<StringName> used_name_defines;
 	Set<StringName> used_rmode_defines;
-- 
cgit v1.2.3


From 27a46d78ec43b69a70a1d84c540353e3cb3b04c0 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Fri, 2 Dec 2016 22:23:16 -0300
Subject: Subsurface scattering material param is now working!

---
 drivers/gles3/shader_compiler_gles3.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'drivers/gles3/shader_compiler_gles3.h')

diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h
index 3549526808..1beee66ad7 100644
--- a/drivers/gles3/shader_compiler_gles3.h
+++ b/drivers/gles3/shader_compiler_gles3.h
@@ -58,6 +58,7 @@ private:
 	StringName time_name;
 
 	Set<StringName> used_name_defines;
+	Set<StringName> used_flag_pointers;
 	Set<StringName> used_rmode_defines;
 	Set<StringName> internal_functions;
 
-- 
cgit v1.2.3