Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 5 files). Show all
Unified · Split
| @@ -459,7 +459,8 @@ _nextID(0) { · 458 unmodified lines | |||
| 459 | // Set the defaults needed for a simple program | 459 | // Set the defaults needed for a simple program |
| 460 | batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, | 460 | batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, |
| 461 | DependencyManager::get<TextureCache>()->getWhiteTexture()); | 461 | DependencyManager::get<TextureCache>()->getWhiteTexture()); |
| 462 | } | 462 | }, |
| 463 | nullptr | ||
| 463 | ); | 464 | ); |
| 464 | GeometryCache::_simpleTransparentPipeline = | 465 | GeometryCache::_simpleTransparentPipeline = |
| 465 | std::make_shared<render::ShapePipeline>(getSimplePipeline(false, true, true, false), nullptr, | 466 | std::make_shared<render::ShapePipeline>(getSimplePipeline(false, true, true, false), nullptr, |
| @@ -467,11 +468,13 @@ _nextID(0) { · 1 unmodified line | |||
| 467 | // Set the defaults needed for a simple program | 468 | // Set the defaults needed for a simple program |
| 468 | batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, | 469 | batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, |
| 469 | DependencyManager::get<TextureCache>()->getWhiteTexture()); | 470 | DependencyManager::get<TextureCache>()->getWhiteTexture()); |
| 470 | } | 471 | }, |
| 472 | nullptr | ||
| 471 | ); | 473 | ); |
| 472 | GeometryCache::_simpleWirePipeline = | 474 | GeometryCache::_simpleWirePipeline = |
| 473 | std::make_shared<render::ShapePipeline>(getSimplePipeline(false, false, true, true), nullptr, | 475 | std::make_shared<render::ShapePipeline>(getSimplePipeline(false, false, true, true), nullptr, |
| 474 | [](const render::ShapePipeline&, gpu::Batch& batch) {}); | 476 | [](const render::ShapePipeline&, gpu::Batch& batch) {}, |
| 477 | nullptr); | ||
| 475 | } | 478 | } |
| 476 | 479 | ||
| 477 | GeometryCache::~GeometryCache() { | 480 | GeometryCache::~GeometryCache() { |