diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2021-12-15 22:12:38 +0300 |
|---|---|---|
| committer | Yuri Roubinsky <chaosus89@gmail.com> | 2021-12-15 22:12:38 +0300 |
| commit | f0a58af12f884e04fe46239633c377d8e4e9da5d (patch) | |
| tree | 08b962855c2617944196df9b85a24140f2e90d09 /servers/rendering | |
| parent | 1cbf3947d60e1edd39101ebd806d641d54cf53f1 (diff) | |
Rename shader hint `filter_anisotropy` to `filter_anisotropic`
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/shader_language.cpp | 20 | ||||
| -rw-r--r-- | servers/rendering/shader_language.h | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index a84944ffc2..7253d9877f 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -214,8 +214,8 @@ const char *ShaderLanguage::token_names[TK_MAX] = { "FILTER_LINEAR", "FILTER_NEAREST_MIPMAP", "FILTER_LINEAR_MIPMAP", - "FILTER_NEAREST_MIPMAP_ANISOTROPY", - "FILTER_LINEAR_MIPMAP_ANISOTROPY", + "FILTER_NEAREST_MIPMAP_ANISOTROPIC", + "FILTER_LINEAR_MIPMAP_ANISOTROPIC", "REPEAT_ENABLE", "REPEAT_DISABLE", "SHADER_TYPE", @@ -328,8 +328,8 @@ const ShaderLanguage::KeyWord ShaderLanguage::keyword_list[] = { { TK_FILTER_LINEAR, "filter_linear" }, { TK_FILTER_NEAREST_MIPMAP, "filter_nearest_mipmap" }, { TK_FILTER_LINEAR_MIPMAP, "filter_linear_mipmap" }, - { TK_FILTER_NEAREST_MIPMAP_ANISOTROPY, "filter_nearest_mipmap_anisotropy" }, - { TK_FILTER_LINEAR_MIPMAP_ANISOTROPY, "filter_linear_mipmap_anisotropy" }, + { TK_FILTER_NEAREST_MIPMAP_ANISOTROPIC, "filter_nearest_mipmap_anisotropic" }, + { TK_FILTER_LINEAR_MIPMAP_ANISOTROPIC, "filter_linear_mipmap_anisotropic" }, { TK_REPEAT_ENABLE, "repeat_enable" }, { TK_REPEAT_DISABLE, "repeat_disable" }, { TK_SHADER_TYPE, "shader_type" }, @@ -8106,10 +8106,10 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct uniform2.filter = FILTER_NEAREST_MIPMAP; } else if (tk.type == TK_FILTER_LINEAR_MIPMAP) { uniform2.filter = FILTER_LINEAR_MIPMAP; - } else if (tk.type == TK_FILTER_NEAREST_MIPMAP_ANISOTROPY) { - uniform2.filter = FILTER_NEAREST_MIPMAP_ANISOTROPY; - } else if (tk.type == TK_FILTER_LINEAR_MIPMAP_ANISOTROPY) { - uniform2.filter = FILTER_LINEAR_MIPMAP_ANISOTROPY; + } else if (tk.type == TK_FILTER_NEAREST_MIPMAP_ANISOTROPIC) { + uniform2.filter = FILTER_NEAREST_MIPMAP_ANISOTROPIC; + } else if (tk.type == TK_FILTER_LINEAR_MIPMAP_ANISOTROPIC) { + uniform2.filter = FILTER_LINEAR_MIPMAP_ANISOTROPIC; } else if (tk.type == TK_REPEAT_DISABLE) { uniform2.repeat = REPEAT_DISABLE; } else if (tk.type == TK_REPEAT_ENABLE) { @@ -9559,10 +9559,10 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_ if (options.is_empty()) { options.push_back("filter_linear"); options.push_back("filter_linear_mipmap"); - options.push_back("filter_linear_mipmap_anisotropy"); + options.push_back("filter_linear_mipmap_anisotropic"); options.push_back("filter_nearest"); options.push_back("filter_nearest_mipmap"); - options.push_back("filter_nearest_mipmap_anisotropy"); + options.push_back("filter_nearest_mipmap_anisotropic"); options.push_back("hint_albedo"); options.push_back("hint_anisotropy"); options.push_back("hint_black"); diff --git a/servers/rendering/shader_language.h b/servers/rendering/shader_language.h index 02a2ef3a67..8502a250b6 100644 --- a/servers/rendering/shader_language.h +++ b/servers/rendering/shader_language.h @@ -179,8 +179,8 @@ public: TK_FILTER_LINEAR, TK_FILTER_NEAREST_MIPMAP, TK_FILTER_LINEAR_MIPMAP, - TK_FILTER_NEAREST_MIPMAP_ANISOTROPY, - TK_FILTER_LINEAR_MIPMAP_ANISOTROPY, + TK_FILTER_NEAREST_MIPMAP_ANISOTROPIC, + TK_FILTER_LINEAR_MIPMAP_ANISOTROPIC, TK_REPEAT_ENABLE, TK_REPEAT_DISABLE, TK_SHADER_TYPE, @@ -322,8 +322,8 @@ public: FILTER_LINEAR, FILTER_NEAREST_MIPMAP, FILTER_LINEAR_MIPMAP, - FILTER_NEAREST_MIPMAP_ANISOTROPY, - FILTER_LINEAR_MIPMAP_ANISOTROPY, + FILTER_NEAREST_MIPMAP_ANISOTROPIC, + FILTER_LINEAR_MIPMAP_ANISOTROPIC, FILTER_DEFAULT, }; |