diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
| commit | 1445b6806b8a359594b1789726aa87d64b279286 (patch) | |
| tree | 26928a4ed18cfcc7b434a17bff7d7488aa8b32ef /drivers/gles2/shader_compiler_gles2.h | |
| parent | c0d363266755de3ac87f61600f23921d881d99e2 (diff) | |
| parent | 30d36581100f0bf71c6d2502be9a03443bdf8708 (diff) | |
Merge branch 'master' into x11-window-management
Diffstat (limited to 'drivers/gles2/shader_compiler_gles2.h')
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index 47ba4aa474..a10fa6dfe0 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -52,6 +52,7 @@ private: bool uses_screen_uv; bool uses_normalmap; bool uses_normal; + bool uses_texpixel_size; bool vertex_code_writes_vertex; Flags *flags; @@ -70,6 +71,7 @@ private: StringName vname_time; StringName vname_normalmap; StringName vname_normal; + StringName vname_texpixel_size; Map<StringName,ShaderLanguage::Uniform> *uniforms; @@ -104,6 +106,7 @@ public: bool uses_light; bool uses_time; bool uses_normal; + bool uses_texpixel_size; }; Error compile(const String& p_code, ShaderLanguage::ShaderType p_type, String& r_code_line, String& r_globals_line, Flags& r_flags, Map<StringName,ShaderLanguage::Uniform> *r_uniforms=NULL); |