blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

Eevee-Next: World Reflective Light #108149

Merged
Jeroen Bakker merged 33 commits from Jeroen-Bakker/blender:eevee-next-world-shader into main 2023-06-29 15:25:04 +02:00
Conversation 0 Commits 33 Files Changed 17 +5 -3
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a58620c766 - Show all commits

2
source/blender/draw/engines/eevee_next/eevee_pipeline.cc
View File

@ -80,7 +80,7 @@ void WorldProbePipeline::sync()
side.cubemap_face_ps.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_ALWAYS);
}
const int2 extent(1);
const eGPUTextureUsage usage = GPU_TEXTURE_USAGE_MEMORYLESS | GPU_TEXTURE_USAGE_SHADER_WRITE;
constexpr eGPUTextureUsage usage = GPU_TEXTURE_USAGE_MEMORYLESS | GPU_TEXTURE_USAGE_SHADER_WRITE;
dummy_cryptomatte_tx_.ensure_2d(GPU_RGBA32F, extent, usage);
dummy_renderpass_tx_.ensure_2d(GPU_RGBA16F, extent, usage);
dummy_aov_color_tx_.ensure_2d_array(GPU_RGBA16F, extent, 1, usage);

2
source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc
View File

@ -22,7 +22,7 @@ void ReflectionProbeModule::init()
MAX_PROBES,
GPU_TEXTURE_USAGE_SHADER_READ | GPU_TEXTURE_USAGE_ATTACHMENT,
NULL,
12);
MIPMAP_LEVELS);
GPU_texture_mipmap_mode(cubemaps_tx_, true, true);
}
}

1
source/blender/draw/engines/eevee_next/eevee_reflection_probes.hh
View File

@ -54,6 +54,7 @@ class ReflectionProbeModule {
* Must be a power of two; intension to be used as a cubemap atlas.
*/
static constexpr int MAX_RESOLUTION = 2048;
Jeroen-Bakker marked this conversation as resolved Outdated
Clément Foucault commented 2023-06-29 10:18:50 +02:00
Outdated
Review
Copy Link

I don't know if this is covered by the next patch, but this should become an option.

I don't know if this is covered by the next patch, but this should become an option.
Jeroen Bakker commented 2023-06-29 11:50:32 +02:00
Outdated
Review
Copy Link

Yes, that will be part of the reflection probe baking patch. Might even land earlier when specific parts of that patch are stable. Currently this part isn't stable to land in main yet.

Yes, that will be part of the reflection probe baking patch. Might even land earlier when specific parts of that patch are stable. Currently this part isn't stable to land in main yet.
static constexpr int MIPMAP_LEVELS = 12;
Jeroen-Bakker marked this conversation as resolved Outdated
Clément Foucault commented 2023-06-29 10:20:01 +02:00
Outdated
Review
Copy Link

Maybe derive it from MAX_RESOLUTION ? log2(MAX_RESOLUTION) + 1

Maybe derive it from `MAX_RESOLUTION` ? `log2(MAX_RESOLUTION) + 1`
/**
* Index of the probe that is used for world background.

3
source/blender/draw/engines/eevee_next/shaders/eevee_reflection_probe_lib.glsl
View File

@ -6,7 +6,8 @@ void light_world_eval(ClosureDiffuse diffuse,
inout vec3 out_specular)
{
float linear_roughness = fast_sqrt(reflection.roughness);
/* TODO: This should be based by actual LOD?.*/
/* TODO: This should be based by actual resolution. Currently the resolution is fixed but
* eventually this should based on a user setting. */
Jeroen-Bakker marked this conversation as resolved Outdated
Jeroen Bakker commented 2023-06-27 11:05:20 +02:00
Outdated
Review
Copy Link

Check lightprobe_filter_glossy_frag

Check `lightprobe_filter_glossy_frag`
float lod_cube_max = 12.0;
float lod = linear_roughness * lod_cube_max;