godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Move TIME to a global shader variable

Browse Source 
This makes it work consistently for motion vectors in all functions, including user-defined ones.
This commit is contained in:
jfons
2022-06-21 16:26:17 +02:00
committed by JFonS
parent fdfbaf9f0f
commit 0f38e79617
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
View File

@@ -621,7 +621,7 @@ void SceneShaderForwardClustered::init(RendererStorageRD *p_storage, const Strin
//builtins //builtins
actions.renames["TIME"] = "scene_data_block.data.time"; actions.renames["TIME"] = "global_time";
actions.renames["PI"] = _MKSTR(Math_PI); actions.renames["PI"] = _MKSTR(Math_PI);
actions.renames["TAU"] = _MKSTR(Math_TAU); actions.renames["TAU"] = _MKSTR(Math_TAU);
actions.renames["E"] = _MKSTR(Math_E); actions.renames["E"] = _MKSTR(Math_E);

7
servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
View File

@@ -96,6 +96,8 @@ layout(set = MATERIAL_UNIFORM_SET, binding = 0, std140) uniform MaterialUniforms
} material; } material;
#endif #endif
float global_time;
#ifdef MODE_DUAL_PARABOLOID #ifdef MODE_DUAL_PARABOLOID
layout(location = 9) out float dp_clip; layout(location = 9) out float dp_clip;
@@ -386,9 +388,12 @@ void main() {
mat4 model_matrix = instances.data[instance_index].transform; mat4 model_matrix = instances.data[instance_index].transform;
#if defined(MOTION_VECTORS) #if defined(MOTION_VECTORS)
global_time = scene_data_block.prev_data.time;
vertex_shader(instance_index, is_multimesh, scene_data_block.prev_data, instances.data[instance_index].prev_transform, prev_screen_position); vertex_shader(instance_index, is_multimesh, scene_data_block.prev_data, instances.data[instance_index].prev_transform, prev_screen_position);
global_time = scene_data_block.data.time;
vertex_shader(instance_index, is_multimesh, scene_data_block.data, model_matrix, screen_position); vertex_shader(instance_index, is_multimesh, scene_data_block.data, model_matrix, screen_position);
#else #else
global_time = scene_data_block.data.time;
vec4 screen_position; vec4 screen_position;
vertex_shader(instance_index, is_multimesh, scene_data_block.data, model_matrix, screen_position); vertex_shader(instance_index, is_multimesh, scene_data_block.data, model_matrix, screen_position);
#endif #endif
@@ -486,6 +491,8 @@ layout(location = 10) in flat uint instance_index_interp;
#define inv_projection_matrix scene_data.inv_projection_matrix #define inv_projection_matrix scene_data.inv_projection_matrix
#endif #endif
#define global_time scene_data_block.data.time
#if defined(ENABLE_SSS) && defined(ENABLE_TRANSMITTANCE) #if defined(ENABLE_SSS) && defined(ENABLE_TRANSMITTANCE)
//both required for transmittance to be enabled //both required for transmittance to be enabled
#define LIGHT_TRANSMITTANCE_USED #define LIGHT_TRANSMITTANCE_USED