diff options
Diffstat (limited to 'drivers/gles2/shader_compiler_gles2.cpp')
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 47 |
1 files changed, 44 insertions, 3 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index db63c3aeba..dfab3ea3d1 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -182,6 +182,13 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a } } + if (type==ShaderLanguage::SHADER_MATERIAL_LIGHT) { + + if (vnode->name==vname_light) { + uses_light=true; + } + + } code=replace_string(vnode->name); @@ -410,7 +417,7 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a } -void ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) { +Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) { // feed the local replace table and global code global_code=""; @@ -423,8 +430,15 @@ void ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) { for(Map<StringName,SL::Uniform>::Element *E=p_program->uniforms.front();E;E=E->next()) { String uline="uniform "+_typestr(E->get().type)+" _"+E->key().operator String()+";"ENDL; + global_code+=uline; if (uniforms) { + //if (uniforms->has(E->key())) { + // //repeated uniform, error + // ERR_EXPLAIN("Uniform already exists from other shader: "+String(E->key())); + // ERR_FAIL_COND_V(uniforms->has(E->key()),ERR_ALREADY_EXISTS); +// +// } SL::Uniform u = E->get(); u.order+=ubase; uniforms->insert(E->key(),u); @@ -474,12 +488,14 @@ void ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) { print_line(code); code=code.replace("\n",""); #endif + + return OK; } -void ShaderCompilerGLES2::create_glsl_120_code(void *p_str,SL::ProgramNode *p_program) { +Error ShaderCompilerGLES2::create_glsl_120_code(void *p_str,SL::ProgramNode *p_program) { ShaderCompilerGLES2 *compiler=(ShaderCompilerGLES2*)p_str; - compiler->compile_node(p_program); + return compiler->compile_node(p_program); } @@ -505,6 +521,7 @@ Error ShaderCompilerGLES2::compile(const String& p_code, ShaderLanguage::ShaderT uses_alpha=false; uses_discard=false; uses_screen_uv=false; + uses_light=false; vertex_code_writes_vertex=false; uniforms=r_uniforms; flags=&r_flags; @@ -533,6 +550,7 @@ Error ShaderCompilerGLES2::compile(const String& p_code, ShaderLanguage::ShaderT r_flags.vertex_code_writes_vertex=vertex_code_writes_vertex; r_flags.uses_discard=uses_discard; r_flags.uses_screen_uv=uses_screen_uv; + r_flags.uses_light=uses_light; r_code_line=code; r_globals_line=global_code; return OK; @@ -577,6 +595,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { replace_table["clamp"]= "clamp"; replace_table["mix" ]= "mix"; replace_table["step" ]= "step"; + replace_table["smoothstep" ]= "smoothstep"; replace_table["length"]= "length"; replace_table["distance"]= "distance"; replace_table["dot" ]= "dot"; @@ -628,6 +647,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { mode_replace_table[1]["DIFFUSE_ALPHA"]="diffuse"; mode_replace_table[1]["SPECULAR"]="specular"; mode_replace_table[1]["EMISSION"]="emission"; + mode_replace_table[1]["SHADE_PARAM"]="shade_param"; mode_replace_table[1]["SPEC_EXP"]="specular_exp"; mode_replace_table[1]["GLOW"]="glow"; mode_replace_table[1]["DISCARD"]="discard_"; @@ -638,6 +658,26 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { //mode_replace_table[1]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE"; mode_replace_table[1]["TIME"]="time"; + ////////////// + + mode_replace_table[2]["NORMAL"]="normal"; + //mode_replace_table[2]["POSITION"]="IN_POSITION"; + mode_replace_table[2]["LIGHT_DIR"]="light_dir"; + mode_replace_table[2]["LIGHT_DIFFUSE"]="light_diffuse"; + mode_replace_table[2]["LIGHT_SPECULAR"]="light_specular"; + mode_replace_table[2]["EYE_VEC"]="eye_vec"; + mode_replace_table[2]["DIFFUSE"]="mdiffuse"; + mode_replace_table[2]["SPECULAR"]="specular"; + mode_replace_table[2]["SPECULAR_EXP"]="specular_exp"; + mode_replace_table[2]["SHADE_PARAM"]="shade_param"; + mode_replace_table[2]["LIGHT"]="light"; + mode_replace_table[2]["POINT_COORD"]="gl_PointCoord"; + mode_replace_table[2]["TIME"]="time"; + + //mode_replace_table[2]["SCREEN_POS"]="SCREEN_POS"; + //mode_replace_table[2]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE"; + + out_vertex_name="VERTEX"; vname_discard="DISCARD"; @@ -651,5 +691,6 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { vname_var1_interp="VAR1"; vname_var2_interp="VAR2"; vname_vertex="VERTEX"; + vname_light="LIGHT"; } |