External shaders saved to .gdshader files are not converted by the project upgrade tool

[Calinou]

Godot version

4.0.beta7

System information

Fedora 36, AMD Radeon RX 6900 XT

Issue description

External shaders saved to .gdshader files are not converted by the 3to4 conversion tool. By contrast, shaders that are built-in to a scene are converted by this tool.

Both built-in and external scripts are correctly converted by 3to4.

Steps to reproduce

• Create a Godot 3.x project with a built-in shader on a node, and an external shader on another. In both files, use syntax that will be converted, such as uniform sampler2D some_texture : hint_albedo where hint_albedo will be converted by source_color.
• Upgrade the project using the tool in the Godot 4.0 project manager.
• Notice how the built-in shader is updated, but not the external shader.

Minimal reproduction project

Before conversion (3.x): test_project_3.zip

After conversion (4.0): test_project_4.zip

[fracteed]

I am also getting no materials in the material slot (now surface material override), so they all have to be manually reloaded. Not sure if this has been reported or not?

[Calinou]

I am also getting no materials in the material slot (now surface material override), so they all have to be manually reloaded. Not sure if this has been reported or not?

Please open a separate issue for this, with MRPs pre-conversion and post-conversion included.

[clayjohn]

CC @qarmin How complex would it be to run the upgrader tool over .gdshader files as well?

[qarmin]

If I remember correctly, conversions already runs on .shader files and convert them to .gdshader with some simple renames -

godot/editor/project_converter_3_to_4.cpp

Lines 1400 to 1416 in 44c0bfc

	static const char *shaders_renames[][2] = {
	{ "ALPHA_SCISSOR", "ALPHA_SCISSOR_THRESHOLD" },
	{ "CAMERA_MATRIX", "INV_VIEW_MATRIX" },
	{ "INV_CAMERA_MATRIX", "VIEW_MATRIX" },
	{ "NORMALMAP", "NORMAL_MAP" },
	{ "NORMALMAP_DEPTH", "NORMAL_MAP_DEPTH" },
	{ "TRANSMISSION", "BACKLIGHT" },
	{ "WORLD_MATRIX", "MODEL_MATRIX" },
	{ "depth_draw_alpha_prepass", "depth_draw_opaque" },
	{ "hint_albedo", "source_color" },
	{ "hint_aniso", "hint_anisotropy" },
	{ "hint_black", "hint_default_black" },
	{ "hint_black_albedo", "hint_default_black" },
	{ "hint_color", "source_color" },
	{ "hint_white", "hint_default_white" },
	{ nullptr, nullptr },
	};

So problem is with extension .gdshader.

If this extension is valid in 3.x, then should be added to files that will be checked for conversion here -

godot/editor/project_converter_3_to_4.cpp

Line 2391 in 44c0bfc

if (file_name.ends_with(".gd") || file_name.ends_with(".shader") || file_name.ends_with(".tscn") || file_name.ends_with(".tres") || file_name.ends_with(".godot") || file_name.ends_with(".cs") || file_name.ends_with(".csproj"))

[clayjohn]

Looks like the .gdshader extension is allows in 3.x, so this should be a simple fix #49983