godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Shader globals bugfixes

Browse Source 
- shader globals editor displays properties correctly
- fixed some errors how globals were transferred
This commit is contained in:
David Sichma
2020-10-21 01:34:25 +02:00
parent 9dad483920
commit 5d33cd94c8
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
servers/rendering/rasterizer_rd/shader_compiler_rd.cpp
View File

@@ -423,13 +423,13 @@ static String _get_global_variable_from_type_and_index(const String &p_buffer, c
return "(" + p_buffer + "[" + p_index + "].x != 0.0)";
}
case ShaderLanguage::TYPE_BVEC2: {
return "(" + p_buffer + "[" + p_index + "].xy != vec2(0.0))";
return "(notEqual(" + p_buffer + "[" + p_index + "].xy, vec2(0.0)))";
}
case ShaderLanguage::TYPE_BVEC3: {
return "(" + p_buffer + "[" + p_index + "].xyz != vec3(0.0))";
return "(notEqual(" + p_buffer + "[" + p_index + "].xyz, vec3(0.0)))";
}
case ShaderLanguage::TYPE_BVEC4: {
return "(" + p_buffer + "[" + p_index + "].xyzw != vec4(0.0))";
return "(notEqual(" + p_buffer + "[" + p_index + "].xyzw, vec4(0.0)))";
}
case ShaderLanguage::TYPE_INT: {
return "floatBitsToInt(" + p_buffer + "[" + p_index + "].x)";
@@ -444,16 +444,16 @@ static String _get_global_variable_from_type_and_index(const String &p_buffer, c
return "floatBitsToInt(" + p_buffer + "[" + p_index + "].xyzw)";
}
case ShaderLanguage::TYPE_UINT: {
return "floatBitsToUInt(" + p_buffer + "[" + p_index + "].x)";
return "floatBitsToUint(" + p_buffer + "[" + p_index + "].x)";
}
case ShaderLanguage::TYPE_UVEC2: {
return "floatBitsToUInt(" + p_buffer + "[" + p_index + "].xy)";
return "floatBitsToUint(" + p_buffer + "[" + p_index + "].xy)";
}
case ShaderLanguage::TYPE_UVEC3: {
return "floatBitsToUInt(" + p_buffer + "[" + p_index + "].xyz)";
return "floatBitsToUint(" + p_buffer + "[" + p_index + "].xyz)";
}
case ShaderLanguage::TYPE_UVEC4: {
return "floatBitsToUInt(" + p_buffer + "[" + p_index + "].xyzw)";
return "floatBitsToUint(" + p_buffer + "[" + p_index + "].xyzw)";
}
case ShaderLanguage::TYPE_FLOAT: {
return "(" + p_buffer + "[" + p_index + "].x)";