summaryrefslogtreecommitdiffstats
path: root/servers/visual/shader_language.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-07-09 14:33:30 +0200
committerGitHub <noreply@github.com>2016-07-09 14:33:30 +0200
commit3a70d4a072fa170ae927e2b416861ccd395f92d2 (patch)
tree0e5a9055880d02055dcc4e00dea1c8b5d9848ba9 /servers/visual/shader_language.cpp
parent0e119a91640acbc7643ff1dd1049bf12ca302d21 (diff)
parentf40f360a2c4ca8e6f2a651dbcca3ae82e2abe7a1 (diff)
downloadredot-engine-3a70d4a072fa170ae927e2b416861ccd395f92d2.tar.gz
Merge pull request #5589 from akien-mga/pr-unused-var
Removing some more unused vars and dead code
Diffstat (limited to 'servers/visual/shader_language.cpp')
-rw-r--r--servers/visual/shader_language.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 0b2a282c04..09b3ada509 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -2539,8 +2539,6 @@ Error ShaderLanguage::parse_block(Parser& parser,BlockNode *p_block) {
Error ShaderLanguage::parse(const Vector<Token>& p_tokens,ShaderType p_type,CompileFunc p_compile_func,void *p_userdata,String *r_error,int *r_err_line,int *r_err_column) {
- uint64_t t = OS::get_singleton()->get_ticks_usec();
-
Parser parser(p_tokens);
parser.program = parser.create_node<ProgramNode>(NULL);
parser.program->body = parser.create_node<BlockNode>(parser.program);
@@ -2605,18 +2603,10 @@ Error ShaderLanguage::parse(const Vector<Token>& p_tokens,ShaderType p_type,Comp
return err;
}
- double tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
- //print_line("parse time: "+rtos(tf));
-
- t = OS::get_singleton()->get_ticks_usec();
-
if (p_compile_func) {
err = p_compile_func(p_userdata,parser.program);
}
- tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
- //print_line("compile time: "+rtos(tf));
-
//clean up nodes created
while(parser.nodegc.size()) {
@@ -2633,22 +2623,16 @@ Error ShaderLanguage::compile(const String& p_code,ShaderType p_type,CompileFunc
*r_err_column=0;
Vector<Token> tokens;
- uint64_t t = OS::get_singleton()->get_ticks_usec();
-
Error err = tokenize(p_code,&tokens,r_error,r_err_line,r_err_column);
if (err!=OK) {
print_line("tokenizer error!");
}
- double tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
- //print_line("tokenize time: "+rtos(tf));
-
if (err!=OK) {
return err;
}
err = parse(tokens,p_type,p_compile_func,p_userdata,r_error,r_err_line,r_err_column);
if (err!=OK) {
- //print_line("LDEBUG: "+lex_debug(p_code));
return err;
}
return OK;