Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -3255,6 +3255,9 @@ namespace render { · 3254 unmodified lines | |||
| 3255 | template <> const Item::Bound payloadGetBound(const BackgroundRenderData::Pointer& stuff) { return Item::Bound(); } | 3255 | template <> const Item::Bound payloadGetBound(const BackgroundRenderData::Pointer& stuff) { return Item::Bound(); } |
| 3256 | template <> void payloadRender(const BackgroundRenderData::Pointer& background, RenderArgs* args) { | 3256 | template <> void payloadRender(const BackgroundRenderData::Pointer& background, RenderArgs* args) { |
| 3257 | 3257 | ||
| 3258 | Q_ASSERT(args->_batch); | ||
| 3259 | gpu::Batch& batch = *args->_batch; | ||
| 3260 | |||
| 3258 | // Background rendering decision | 3261 | // Background rendering decision |
| 3259 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); | 3262 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); |
| 3260 | auto skybox = model::SkyboxPointer(); | 3263 | auto skybox = model::SkyboxPointer(); |
| @@ -3322,7 +3325,11 @@ namespace render { · 61 unmodified lines | |||
| 3322 | PerformanceTimer perfTimer("atmosphere"); | 3325 | PerformanceTimer perfTimer("atmosphere"); |
| 3323 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 3326 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 3324 | "Application::displaySide() ... atmosphere..."); | 3327 | "Application::displaySide() ... atmosphere..."); |
| 3325 | background->_environment->renderAtmospheres(*(args->_viewFrustum)); | 3328 | //gpu::Batch batch; |
| 3329 | background->_environment->renderAtmospheres(batch, *(args->_viewFrustum)); | ||
| 3330 | //gpu::GLBackend::renderBatch(batch, true); | ||
| 3331 | //glUseProgram(0); | ||
| 3332 | |||
| 3326 | } | 3333 | } |
| 3327 | 3334 | ||
| 3328 | } | 3335 | } |
| @@ -3333,7 +3340,6 @@ namespace render { · 4 unmodified lines | |||
| 3333 | if (skybox) { | 3340 | if (skybox) { |
| 3334 | gpu::Batch batch; | 3341 | gpu::Batch batch; |
| 3335 | model::Skybox::render(batch, *(Application::getInstance()->getDisplayViewFrustum()), *skybox); | 3342 | model::Skybox::render(batch, *(Application::getInstance()->getDisplayViewFrustum()), *skybox); |
| 3336 | |||
| 3337 | gpu::GLBackend::renderBatch(batch, true); | 3343 | gpu::GLBackend::renderBatch(batch, true); |
| 3338 | glUseProgram(0); | 3344 | glUseProgram(0); |
| 3339 | } | 3345 | } |