diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-02-08 15:00:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 15:00:32 -0800 |
| commit | e24f631110c4fb3ca135b6d6dfaa448062e2f9bd (patch) | |
| tree | c87231a17d1699de3ea9036a3b890f775cede125 | |
| parent | 1a353aafb72cafb1d21626a2ba47e41e3716c9b1 (diff) | |
| parent | ae46dc068e47475c9a874c22047312152cd8fdab (diff) | |
Merge pull request #770 from secondlife/vi-67
secondlife/viewer-issues#67: Add test plan + fix Windows build
| -rw-r--r-- | doc/testplans/terrain_loading.md | 4 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/testplans/terrain_loading.md b/doc/testplans/terrain_loading.md new file mode 100644 index 0000000000..b84daf6f73 --- /dev/null +++ b/doc/testplans/terrain_loading.md @@ -0,0 +1,4 @@ +- Texture terrain should load +- PBR terrain should load if enabled +- Related subsystem: A change to the PBR terrain loading system may affect the texture terrain loading system and vice-versa +- Related subsystem: Minimaps should load if terrain loads (may take longer) diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 8844f1d7e4..2d198c5b4b 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -366,9 +366,11 @@ void LLDrawPoolTerrain::renderFullShaderPBR(BOOL local_materials) LLVLComposition *compp = regionp->getComposition(); LLPointer<LLFetchedGLTFMaterial> (*fetched_materials)[LLVLComposition::ASSET_COUNT] = &compp->mDetailMaterials; - constexpr U32 shader_material_count = 1 + LLViewerShaderMgr::TERRAIN_DETAIL3_BASE_COLOR - LLViewerShaderMgr::TERRAIN_DETAIL0_BASE_COLOR; constexpr U32 terrain_material_count = LLVLComposition::ASSET_COUNT; +#ifdef SHOW_ASSERT + constexpr U32 shader_material_count = 1 + LLViewerShaderMgr::TERRAIN_DETAIL3_BASE_COLOR - LLViewerShaderMgr::TERRAIN_DETAIL0_BASE_COLOR; llassert(shader_material_count == terrain_material_count); +#endif if (local_materials) { |