ADD: update docs

This commit is contained in:
2025-11-15 23:24:17 +09:00
parent c6554f7d9a
commit 84ba26ee2b
2 changed files with 139 additions and 10 deletions

101
docs/IBL.md Normal file
View File

@@ -0,0 +1,101 @@
Image-Based Lighting (IBL)
Overview
- IBL assets (environment maps + BRDF LUT + SH coefficients) are managed by `IBLManager` (`src/core/ibl_manager.{h,cpp}`) and exposed to passes via `EngineContext::ibl`.
- Shaders share a common include, `shaders/ibl_common.glsl`, which defines the IBL bindings for descriptor set 3 and helper functions used by deferred, forward, and background passes.
- The engine currently supports:
- Specular environment from an equirectangular 2D texture with prefiltered mips (`sampler2D iblSpec2D`).
- Diffuse irradiance from 2ndorder SH (9 coefficients baked on the CPU).
- A 2D BRDF integration LUT used for the splitsum approximation.
Data Flow
- Init:
- `VulkanEngine::init_vulkan()` creates an `IBLManager`, calls `init(context)`, and publishes it via `EngineContext::ibl`.
- The engine optionally loads default IBL assets (`IBLPaths` in `src/core/vk_engine.cpp`), typically a BRDF LUT plus a specular environment `.ktx2`.
- Loading (IBLManager):
- `IBLManager::load(const IBLPaths&)`:
- Specular:
- Tries `ktxutil::load_ktx2_cubemap` first. If successful, uploads via `ResourceManager::create_image_compressed_layers` with `VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT`.
- If cubemap loading fails, falls back to 2D `.ktx2` via `ktxutil::load_ktx2_2d` and `create_image_compressed`. The image is treated as equirectangular with prefiltered mips.
- When the specular `.ktx2` is HDR (`R16G16B16A16_SFLOAT` or `R32G32B32A32_SFLOAT`) and 2:1 aspect, `IBLManager` computes 9 SH coefficients on the CPU:
- Integrates the environment over the sphere using real SH basis functions (L2) with solidangle weighting.
- Applies Lambert band scaling (A0 = π, A1 = 2π/3, A2 = π/4).
- Uploads the result as `vec4 sh[9]` in a uniform buffer (`_shBuffer`).
- Diffuse:
- If `IBLPaths::diffuseCube` is provided and valid, loads it as a cubemap via `load_ktx2_cubemap` + `create_image_compressed_layers`.
- Current shaders only use the SH buffer for diffuse; the diffuse cubemap is reserved for future variants.
- BRDF LUT:
- Loaded as 2D `.ktx2` via `ktxutil::load_ktx2_2d` and uploaded with `create_image_compressed`.
- Fallbacks:
- If `diffuseCube` is missing but a specular env exists, `_diff` is aliased to `_spec`.
- `IBLManager::unload()` releases GPU images, the SH buffer, and the descriptor set layout.
- Descriptor layout:
- `IBLManager::ensureLayout()` builds a descriptor set layout (set=3) with:
- binding 0: `COMBINED_IMAGE_SAMPLER` — specular environment (2D equirect).
- binding 1: `COMBINED_IMAGE_SAMPLER` — BRDF LUT 2D.
- binding 2: `UNIFORM_BUFFER` — SH coefficients (`vec4 sh[9]`).
- Passes request this layout from `EngineContext::ibl` and plug it into their pipeline set layouts:
- Background: `vk_renderpass_background.cpp` (set 3 used for env background).
- Lighting: `vk_renderpass_lighting.cpp` (deferred lighting pass, set 3).
- Transparent: `vk_renderpass_transparent.cpp` (forward/transparent materials, set 3).
Shader Side (`shaders/ibl_common.glsl`)
- Bindings:
- `layout(set=3, binding=0) uniform sampler2D iblSpec2D;`
- `layout(set=3, binding=1) uniform sampler2D iblBRDF;`
- `layout(std140, set=3, binding=2) uniform IBL_SH { vec4 sh[9]; } iblSH;`
- Helpers:
- `vec3 sh_eval_irradiance(vec3 n)`:
- Evaluates the 9 SH basis functions (L2) at direction `n` using the same real SH basis as the CPU bake.
- Multiplies each basis value by the corresponding `iblSH.sh[i].rgb` coefficient and sums the result.
- Coefficients are already convolved with the Lambert kernel on the CPU; the function returns diffuse irradiance directly.
- `vec2 dir_to_equirect(vec3 d)`:
- Normalizes `d`, computes `(phi, theta)` and returns equirectangular UV in `[0,1]²`.
- Used consistently by background, deferred, and forward pipelines.
- `float ibl_lod_from_roughness(float roughness, float levels)`:
- Computes the mip LOD for specular IBL using `roughness² * (levels - 1)`.
- This biases midroughness reflections towards blurrier mips and avoids overly sharp reflections.
Usage in Passes
- Deferred lighting (`shaders/deferred_lighting.frag` and `shaders/deferred_lighting_nort.frag`):
- Include:
- `#include "input_structures.glsl"`
- `#include "ibl_common.glsl"`
- IBL contribution (per pixel):
- Specular:
- `vec3 R = reflect(-V, N);`
- `float levels = float(textureQueryLevels(iblSpec2D));`
- `float lod = ibl_lod_from_roughness(roughness, levels);`
- `vec2 uv = dir_to_equirect(R);`
- `vec3 prefiltered = textureLod(iblSpec2D, uv, lod).rgb;`
- `vec2 brdf = texture(iblBRDF, vec2(max(dot(N,V),0.0), roughness)).rg;`
- `vec3 specIBL = prefiltered * (F0 * brdf.x + brdf.y);`
- Diffuse:
- `vec3 diffIBL = (1.0 - metallic) * albedo * sh_eval_irradiance(N);`
- Combined:
- `color += diffIBL + specIBL;`
- Forward/transparent (`shaders/mesh.frag`):
- Same include and IBL logic as deferred, applied after direct lighting.
- Uses the same `ibl_lod_from_roughness` helper for LOD selection.
- Background (`shaders/background_env.frag`):
- Includes `ibl_common.glsl` and uses `dir_to_equirect(worldDir)` + `textureLod(iblSpec2D, uv, 0.0)` to render the environment at LOD 0.
Authoring IBL Assets
- Specular environment:
- Preferred: prefiltered HDR cubemap in `.ktx2` (BC6H or `R16G16B16A16_SFLOAT`) with multiple mips.
- Alternative: prefiltered equirectangular 2D `.ktx2` with width = 2 × height and full mip chain.
- Make sure the mip chain is generated with a GGX importance sampling tool so the BRDF LUT + mip chain match.
- BRDF LUT:
- A standard 2D preintegrated GGX LUT (RG), usually stored as `R8G8_UNORM` or BC5.
- The LUT is sampled with `(NoV, roughness)` coordinates.
- Diffuse:
- The engine currently uses SH coefficients baked from the specular equirectangular map. If you provide a separate diffuse cubemap, the CPU SH bake still uses the specular HDR; you can adjust this in `IBLManager` if you want SH to come from a different source.
Implementation Notes
- CPU SH bake:
- Implemented in `IBLManager::load` using libktx to access raw HDR pixel data from `.ktx2`.
- Uses a simple nested loop over pixels with solidangle weighting and the same SH basis as `sh_eval_irradiance`.
- Fallbacks:
- Lighting and transparent passes create small fallback textures so that the IBL descriptor set is always valid, even when no IBL assets are loaded.
- Background pass builds a 1×1×6 black cube as a fallback env.

View File

@@ -8,6 +8,7 @@ Overview
- glTF loader: `src/scene/vk_loader.cpp` builds keys, requests handles, and registers descriptor patches with the cache.
- Primitives/adhoc: `src/core/asset_manager.cpp` builds materials and registers texture watches.
- Visibility: `src/render/vk_renderpass_geometry.cpp` and `src/render/vk_renderpass_transparent.cpp` call `TextureCache::markSetUsed(...)` for sets that are actually drawn.
- IBL: highdynamicrange environment textures are typically loaded directly as `.ktx2` via `IBLManager` instead of the generic streaming cache. See “ImageBased Lighting (IBL)” below.
Data Flow
- Request
@@ -65,27 +66,54 @@ Implementation Notes
- Material descriptor sets and pools are created with `UPDATE_AFTER_BIND` flags; patches are applied safely across frames using a `DescriptorWriter`.
- Key hashing
- 64bit FNV1a for dedup. FilePath keys hash `PATH:<path>#(sRGB|UNORM)`. Bytes keys hash the payload and XOR an sRGB tag when requested.
- Format selection and channel packing
- `TextureKey::channels` can be `Auto` (default), `R`, `RG`, or `RGBA`. The cache chooses `VK_FORMAT_R8/R8G8/RGBA8` (sRGB variants when requested) and packs channels on CPU for `R`/`RG` to reduce staging + VRAM.
- Progressive downscale
- The decode thread downsizes large images by powers of 2 until within `Max Upload Dimension`, reducing both staging and VRAM. You can increase the cap or disable it (set to 0) from the UI.
- Format selection and channel packing
- `TextureKey::channels` can be `Auto` (default), `R`, `RG`, or `RGBA`. The cache chooses `VK_FORMAT_R8/R8G8/RGBA8` (sRGB variants when requested) and packs channels on CPU for `R`/`RG` to reduce staging + VRAM.
- Progressive downscale
- The decode thread downsizes large images by powers of 2 until within `Max Upload Dimension`, reducing both staging and VRAM. You can increase the cap or disable it (set to 0) from the UI.
KTX2 specifics
- Supported: 2D, singleface, singlelayer KTX2. If BasisLZ/UASTC, libktx transcodes to BCn. sRGB/UNORM is honored from the files DFD and can be nudged by request (albedo sRGB, MR/normal UNORM).
- Not supported: Cube/array/multilayer KTX2 (current code path assumes single layer, 2D).
- Not supported: Cube/array/multilayer KTX2 in the generic cache path (it assumes singlelayer, 2D). Cubemap KTX2 for IBL is loaded via `IBLManager` (see below).
Limitations / Future Work
- Linearblit capability check
- `generate_mipmaps` always uses `VK_FILTER_LINEAR`. Add a format/feature check and a fallback path (nearest or compute downsample).
- `vkutil::generate_mipmaps` / `generate_mipmaps_levels` always use `VK_FILTER_LINEAR` for blits without checking `VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT`. Add a performat capability check and a fallback path (nearest or compute downsample) for formats that do not support linear filtering (especially some compressed formats).
- Texture formats
- Raster path: 8bit R/RG/RGBA via stb_image. Compressed path: BCn via `.ktx2`. Future: ASTC/ETC2, specialized R8/RG8 parsing, and float HDR support (`stbi_loadf``R16G16B16A16_SFLOAT`).
- Raster path: limited to 8bit R/RG/RGBA via `stbi_load`. KTX2 path in `TextureCache::worker_loop` currently accepts only BCn/BC6H formats and rejects other VkFormats returned by libktx (e.g., uncompressed `R16G16B16A16_SFLOAT`). Future work: ASTC/ETC2, specialized R8/RG8 parsing, and float HDR support (`stbi_loadf``R16G16B16A16_SFLOAT`) so HDR albedo/lighting data can stream through the generic cache (today HDR IBL uses the separate `IBLManager` path).
- Normalmap mip quality
- Linear blits reduce normal length; consider a compute renormalization pass.
- Normal maps share the same linear blit pipeline as color textures; no renormalization pass runs after mip generation. Consider a compute or fragment pass to renormalize normal map mips (or a dedicated normalaware downsample) to improve shading at grazing angles and distant LODs.
- Samplers
- Anisotropy is currently disabled in `SamplerManager`; enable when supported and expose a knob.
- Anisotropy is currently disabled in `SamplerManager` (`anisotropyEnable = VK_FALSE`). Enable it when the feature is present, expose a knob in the Debug UI, and consider permaterial/pertexture anisotropy settings.
- Minor robustness
- `enqueue_decode()` derives the handle via pointer arithmetic on `_entries`. Passing the precomputed index would avoid any future reallocation hazards.
- `enqueue_decode()` computes the handle from the entry pointer (`&e - _entries.data()`) and passes it to worker threads. This is safe as long as `_entries` is not resized during enqueue, but storing the index explicitly when the entry is created (in `request()`) would make the relationship clearer and robust against future refactors.
Operational Tips
- Keep deferred uploads enabled (`ResourceManager::set_deferred_uploads(true)`) to coalesce copies per frame (engine does this during init).
- To debug VMA allocations and name images, set `VE_VMA_DEBUG=1`.
ImageBased Lighting (IBL) Textures
- Manager: `src/core/ibl_manager.{h,cpp}` owns IBL GPU resources and the shared descriptor set layout for set=3.
- Inputs (`IBLPaths`):
- `specularCube`: preferred is a GPUready `.ktx2` (BC6H or `R16G16B16A16_SFLOAT`) containing either a cubemap or an equirectangular 2D env with prefiltered mips.
- `diffuseCube`: optional `.ktx2` cubemap for diffuse irradiance. If missing, diffuse IBL falls back to SH only.
- `brdfLut2D`: `.ktx2` 2D RG LUT (e.g., `VK_FORMAT_R8G8_UNORM` or BC5).
- Loading:
- Specular:
- If `specularCube` is a cubemap `.ktx2`, `IBLManager` uses `ktxutil::load_ktx2_cubemap` and uploads via `ResourceManager::create_image_compressed_layers`, preserving the files format and mip chain.
- If cubemap load fails, it falls back to 2D `.ktx2` via `ktxutil::load_ktx2_2d` + `ResourceManager::create_image_compressed`. The image is treated as equirectangular with prefiltered mips and sampled with explicit LOD in shaders.
- If the format is float HDR (`R16G16B16A16_SFLOAT` or `R32G32B32A32_SFLOAT`) and the aspect ratio is 2:1, `IBLManager` additionally computes 2ndorder SH coefficients (9×`vec3`) on the CPU for diffuse irradiance and uploads them to a UBO (`_shBuffer`).
- Diffuse (optional):
- If `diffuseCube` is provided and valid, it is uploaded as a cubemap using `create_image_compressed_layers`. Current shaders use the SH buffer for diffuse; this cubemap can be wired into a future path if you want to sample it directly.
- BRDF LUT:
- `brdfLut2D` is loaded as 2D `.ktx2` via `ktxutil::load_ktx2_2d` and uploaded with `create_image_compressed`.
- Fallbacks:
- `LightingPass` and `TransparentPass` create tiny 1×1 UNORM textures (grey 2D for env, RG for BRDF LUT) so shaders can safely sample IBL bindings even when IBL assets are not loaded.
- Descriptor layout & bindings:
- `IBLManager::ensureLayout()` creates a descriptor set layout for set=3 with:
- binding 0: `COMBINED_IMAGE_SAMPLER` — specular env (2D equirect with mips or cubemap sampled via 2D path).
- binding 1: `COMBINED_IMAGE_SAMPLER` — BRDF LUT 2D.
- binding 2: `UNIFORM_BUFFER` — SH coefficients (`vec4 sh[9]`, RGB in `.xyz`).
- Render passes that use IBL fetch this layout from `EngineContext::ibl` and allocate perframe sets:
- `vk_renderpass_lighting.cpp`: deferred lighting (set=3).
- `vk_renderpass_transparent.cpp`: forward/transparent PBR materials (set=3).
- `vk_renderpass_background.cpp`: environment background (set=3; only binding 0 is used in the shader).