diff options
| author | Pedro J. Estébanez | 2017-03-06 18:31:29 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez | 2017-03-06 18:31:29 +0100 |
| commit | 1e79f80b9046e613cc78bde7c2c1f182264ee369 (patch) | |
| tree | dfa5a3831189ee7b80613d73bd7d2d415888dd34 | |
| parent | 6a628311956b3f20a3e681cbbaf9fb42a86401b4 (diff) | |
| download | godot-1e79f80b9046e613cc78bde7c2c1f182264ee369.tar.gz godot-1e79f80b9046e613cc78bde7c2c1f182264ee369.tar.zst godot-1e79f80b9046e613cc78bde7c2c1f182264ee369.zip | |
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 5 | ||||
| -rw-r--r-- | servers/visual/shader_language.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 6a12d3b3d..0da4f5192 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -876,8 +876,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["EXTRA_MATRIX"]="extra_matrix"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["TIME"]="time"; - //mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POSITION"]="gl_Position"; - mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POSITION"]="gl_FragCoord"; + mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POSITION"]="(gl_FragCoord.xy)"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMAL"]="normal"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP"]="normal_map"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP_DEPTH"]="normal_depth"; @@ -892,7 +891,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POINT_COORD"]="gl_PointCoord"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TIME"]="time"; - mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POSITION"]="gl_Position"; + mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POSITION"]="(gl_FragCoord.xy)"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["NORMAL"]="normal"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["UV"]="uv_interp"; mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["COLOR"]="color"; diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 1a0ce1379..0c224ea71 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1153,7 +1153,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_vertex_builtins_defs[]={ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_fragment_builtins_defs[]={ { "SRC_COLOR", TYPE_VEC4}, - { "POSITION", TYPE_VEC4}, + { "POSITION", TYPE_VEC2}, { "NORMAL", TYPE_VEC3}, { "NORMALMAP", TYPE_VEC3}, { "NORMALMAP_DEPTH", TYPE_FLOAT}, @@ -1175,7 +1175,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_fragment_builtins_defs[]={ const ShaderLanguage::BuiltinsDef ShaderLanguage::ci_light_builtins_defs[]={ - { "POSITION", TYPE_VEC4}, + { "POSITION", TYPE_VEC2}, { "NORMAL", TYPE_VEC3}, { "UV", TYPE_VEC2}, { "COLOR", TYPE_VEC4}, |