asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #66107 from devloglogan/ambient-light-disabled-fix

Browse source 
Fix ambient_light_disabled render mode flag
This commit is contained in:
Clay John 2022-10-27 10:08:29 -07:00 committed by GitHub
commit 0d711cad30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gles3/shaders/scene.glsl
View file

@ -1129,9 +1129,15 @@ void main() {
#if defined(CUSTOM_IRRADIANCE_USED)
ambient_light = mix(ambient_light, custom_irradiance.rgb, custom_irradiance.a);
#endif // CUSTOM_IRRADIANCE_USED
ambient_light *= albedo.rgb;
ambient_light *= ao;
{
#if defined(AMBIENT_LIGHT_DISABLED)
ambient_light = vec3(0.0, 0.0, 0.0);
#else
ambient_light *= albedo.rgb;
ambient_light *= ao;
#endif // AMBIENT_LIGHT_DISABLED
}
// convert ao to direct light ao
ao = mix(1.0, ao, ao_light_affect);

21
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View file

@ -1447,16 +1447,19 @@ void fragment_shader(in SceneData scene_data) {
}
//finalize ambient light here
ambient_light *= albedo.rgb;
ambient_light *= ao;
{
#if defined(AMBIENT_LIGHT_DISABLED)
ambient_light = vec3(0.0, 0.0, 0.0);
#else
ambient_light *= albedo.rgb;
ambient_light *= ao;
// convert ao to direct light ao
ao = mix(1.0, ao, ao_light_affect);
if (bool(implementation_data.ss_effects_flags & SCREEN_SPACE_EFFECTS_FLAGS_USE_SSIL)) {
vec4 ssil = textureLod(sampler2D(ssil_buffer, material_samplers[SAMPLER_LINEAR_CLAMP]), screen_uv, 0.0);
ambient_light *= 1.0 - ssil.a;
ambient_light += ssil.rgb * albedo.rgb;
if (bool(scene_data.ss_effects_flags & SCREEN_SPACE_EFFECTS_FLAGS_USE_SSIL)) {
vec4 ssil = textureLod(sampler2D(ssil_buffer, material_samplers[SAMPLER_LINEAR_CLAMP]), screen_uv, 0.0);
ambient_light *= 1.0 - ssil.a;
ambient_light += ssil.rgb * albedo.rgb;
}
#endif // AMBIENT_LIGHT_DISABLED
}
//this saves some VGPRs

10
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View file

@ -1172,8 +1172,14 @@ void main() {
} //Reflection probes
// finalize ambient light here
ambient_light *= albedo.rgb;
ambient_light *= ao;
{
#if defined(AMBIENT_LIGHT_DISABLED)
ambient_light = vec3(0.0, 0.0, 0.0);
#else
ambient_light *= albedo.rgb;
ambient_light *= ao;
#endif // AMBIENT_LIGHT_DISABLED
}
// convert ao to direct light ao
ao = mix(1.0, ao, ao_light_affect);