Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 2 files). Show all
Unified · Split
| @@ -52,63 +52,61 @@ void ToneMappingDeferred::run(const SceneContextPointer& sceneContext, const Ren · 51 unmodified lines | |||
| 52 | 52 | ||
| 53 | RenderDeferredTask::RenderDeferredTask() : Task() { | 53 | RenderDeferredTask::RenderDeferredTask() : Task() { |
| 54 | // CPU only, create the list of renderedOpaques items | 54 | // CPU only, create the list of renderedOpaques items |
| 55 | addJob("FetchOpaque", std::make_shared<FetchItems::JobModel>( | 55 | addJob<FetchItems>("FetchOpaque", FetchItems([](const RenderContextPointer& context, int count) { |
| 56 | FetchItems([](const RenderContextPointer& context, int count) { | 56 | context->getItemsConfig().opaque.numFeed = count; |
| 57 | context->getItemsConfig().opaque.numFeed = count; | 57 | })); |
| 58 | }) | 58 | addJob<CullItemsOpaque>("CullOpaque", _jobs.back().getOutput()); |
| 59 | )); | 59 | addJob<DepthSortItems>("DepthSortOpaque", _jobs.back().getOutput()); |
| 60 | addJob("CullOpaque", std::make_shared<CullItemsOpaque::JobModel>(_jobs.back().getOutput())); | ||
| 61 | addJob("DepthSortOpaque", std::make_shared<DepthSortItems::JobModel>(_jobs.back().getOutput())); | ||
| 62 | auto& renderedOpaques = _jobs.back().getOutput(); | 60 | auto& renderedOpaques = _jobs.back().getOutput(); |
| 63 | 61 | ||
| 64 | // CPU only, create the list of renderedTransparents items | 62 | // CPU only, create the list of renderedTransparents items |
| 65 | addJob("FetchTransparent", std::make_shared<FetchItems::JobModel>( | 63 | addJob<FetchItems>("FetchTransparent", FetchItems( |
| 66 | FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(), | 64 | ItemFilter::Builder::transparentShape().withoutLayered(), |
| 67 | [](const RenderContextPointer& context, int count) { | 65 | [](const RenderContextPointer& context, int count) { |
| 68 | context->getItemsConfig().transparent.numFeed = count; | 66 | context->getItemsConfig().transparent.numFeed = count; |
| 69 | }) | 67 | } |
| 70 | )); | 68 | )); |
| 71 | addJob("CullTransparent", std::make_shared<CullItemsTransparent::JobModel>(_jobs.back().getOutput())); | 69 | addJob<CullItemsTransparent>("CullTransparent", _jobs.back().getOutput()); |
| 72 | addJob("DepthSortTransparent", std::make_shared<DepthSortItems::JobModel>(_jobs.back().getOutput(), DepthSortItems(false))); | 70 | addJob<DepthSortItems>("DepthSortTransparent", _jobs.back().getOutput(), DepthSortItems(false)); |
| 73 | auto& renderedTransparents = _jobs.back().getOutput(); | 71 | auto& renderedTransparents = _jobs.back().getOutput(); |
| 74 | 72 | ||
| 75 | // GPU Jobs: Start preparing the deferred and lighting buffer | 73 | // GPU Jobs: Start preparing the deferred and lighting buffer |
| 76 | addJob("PrepareDeferred", std::make_shared<PrepareDeferred::JobModel>()); | 74 | addJob<PrepareDeferred>("PrepareDeferred"); |
| 77 | 75 | ||
| 78 | // Render opaque objects in DeferredBuffer | 76 | // Render opaque objects in DeferredBuffer |
| 79 | addJob("DrawOpaqueDeferred", std::make_shared<DrawOpaqueDeferred::JobModel>(renderedOpaques)); | 77 | addJob<DrawOpaqueDeferred>("DrawOpaqueDeferred", renderedOpaques); |
| 80 | 78 | ||
| 81 | // Once opaque is all rendered create stencil background | 79 | // Once opaque is all rendered create stencil background |
| 82 | addJob("DrawOpaqueStencil", std::make_shared<DrawStencilDeferred::JobModel>()); | 80 | addJob<DrawStencilDeferred>("DrawOpaqueStencil"); |
| 83 | 81 | ||
| 84 | // Use Stencil and start drawing background in Lighting buffer | 82 | // Use Stencil and start drawing background in Lighting buffer |
| 85 | addJob("DrawBackgroundDeferred", std::make_shared<DrawBackgroundDeferred::JobModel>()); | 83 | addJob<DrawBackgroundDeferred>("DrawBackgroundDeferred"); |
| 86 | 84 | ||
| 87 | // Draw Lights just add the lights to the current list of lights to deal with. NOt really gpu job for now. | 85 | // Draw Lights just add the lights to the current list of lights to deal with. NOt really gpu job for now. |
| 88 | addJob("DrawLight", std::make_shared<DrawLight::JobModel>()); | 86 | addJob<DrawLight>("DrawLight"); |
| 89 | 87 | ||
| 90 | // DeferredBuffer is complete, now let's shade it into the LightingBuffer | 88 | // DeferredBuffer is complete, now let's shade it into the LightingBuffer |
| 91 | addJob("RenderDeferred", std::make_shared<RenderDeferred::JobModel>()); | 89 | addJob<RenderDeferred>("RenderDeferred"); |
| 92 | 90 | ||
| 93 | // AO job, to be revisited | 91 | // AO job, to be revisited |
| 94 | addJob("AmbientOcclusion", std::make_shared<AmbientOcclusion::JobModel>()); | 92 | addJob<AmbientOcclusion>("AmbientOcclusion"); |
| 95 | _jobs.back().setEnabled(false); | 93 | _jobs.back().setEnabled(false); |
| 96 | _occlusionJobIndex = (int)_jobs.size() - 1; | 94 | _occlusionJobIndex = (int)_jobs.size() - 1; |
| 97 | 95 | ||
| 98 | // AA job to be revisited | 96 | // AA job to be revisited |
| 99 | addJob("Antialiasing", std::make_shared<Antialiasing::JobModel>()); | 97 | addJob<Antialiasing>("Antialiasing"); |
| 100 | _jobs.back().setEnabled(false); | 98 | _jobs.back().setEnabled(false); |
| 101 | _antialiasingJobIndex = (int)_jobs.size() - 1; | 99 | _antialiasingJobIndex = (int)_jobs.size() - 1; |
| 102 | 100 | ||
| 103 | // Render transparent objects forward in LigthingBuffer | 101 | // Render transparent objects forward in LigthingBuffer |
| 104 | addJob("TransparentDeferred", std::make_shared<DrawTransparentDeferred::JobModel>(renderedTransparents)); | 102 | addJob<DrawTransparentDeferred>("TransparentDeferred", renderedTransparents); |
| 105 | 103 | ||
| 106 | // Lighting Buffer ready for tone mapping | 104 | // Lighting Buffer ready for tone mapping |
| 107 | addJob("ToneMapping", std::make_shared<ToneMappingDeferred::JobModel>()); | 105 | addJob<ToneMappingDeferred>("ToneMapping"); |
| 108 | _toneMappingJobIndex = (int)_jobs.size() - 1; | 106 | _toneMappingJobIndex = (int)_jobs.size() - 1; |
| 109 | 107 | ||
| 110 | // Debugging Deferred buffer job | 108 | // Debugging Deferred buffer job |
| 111 | addJob("DebugDeferredBuffer", std::make_shared<DebugDeferredBuffer::JobModel>()); | 109 | addJob<DebugDeferredBuffer>("DebugDeferredBuffer"); |
| 112 | _jobs.back().setEnabled(false); | 110 | _jobs.back().setEnabled(false); |
| 113 | _drawDebugDeferredBufferIndex = (int)_jobs.size() - 1; | 111 | _drawDebugDeferredBufferIndex = (int)_jobs.size() - 1; |
| 114 | 112 | ||
| @@ -117,18 +115,18 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 2 unmodified lines | |||
| 117 | // Grab a texture map representing the different status icons and assign that to the drawStatsuJob | 115 | // Grab a texture map representing the different status icons and assign that to the drawStatsuJob |
| 118 | auto iconMapPath = PathUtils::resourcesPath() + "icons/statusIconAtlas.svg"; | 116 | auto iconMapPath = PathUtils::resourcesPath() + "icons/statusIconAtlas.svg"; |
| 119 | auto statusIconMap = DependencyManager::get<TextureCache>()->getImageTexture(iconMapPath); | 117 | auto statusIconMap = DependencyManager::get<TextureCache>()->getImageTexture(iconMapPath); |
| 120 | addJob("DrawStatus", std::make_shared<DrawStatus::JobModel>(renderedOpaques, DrawStatus(statusIconMap))); | 118 | addJob<DrawStatus>("DrawStatus", renderedOpaques, DrawStatus(statusIconMap)); |
| 121 | _jobs.back().setEnabled(false); | 119 | _jobs.back().setEnabled(false); |
| 122 | _drawStatusJobIndex = (int)_jobs.size() - 1; | 120 | _drawStatusJobIndex = (int)_jobs.size() - 1; |
| 123 | } | 121 | } |
| 124 | 122 | ||
| 125 | addJob("DrawOverlay3D", std::make_shared<DrawOverlay3D::JobModel>()); | 123 | addJob<DrawOverlay3D>("DrawOverlay3D"); |
| 126 | 124 | ||
| 127 | addJob("HitEffect", std::make_shared<HitEffect::JobModel>()); | 125 | addJob<HitEffect>("HitEffect"); |
| 128 | _jobs.back().setEnabled(false); | 126 | _jobs.back().setEnabled(false); |
| 129 | _drawHitEffectJobIndex = (int)_jobs.size() -1; | 127 | _drawHitEffectJobIndex = (int)_jobs.size() -1; |
| 130 | 128 | ||
| 131 | addJob("Blit", std::make_shared<Blit::JobModel>()); | 129 | addJob<Blit>("Blit"); |
| 132 | } | 130 | } |
| 133 | 131 | ||
| 134 | void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) { | 132 | void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) { |