History

Gut RenderContext

Zach Pomerantz committed 10 years ago

Commit f3265db1 parent e8b8f4d19 files · +117 −142Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 19 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+19−22
@@ -60,7 +60,7 @@ using namespace render; · 59 unmodified lines
6060 void initDeferredPipelines(render::ShapePlumber& plumber);
6161
6262 void PrepareDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
63− DependencyManager::get<DeferredLightingEffect>()->prepare(renderContext->getArgs());
63+ DependencyManager::get<DeferredLightingEffect>()->prepare(renderContext->args);
6464 }
6565
6666 void RenderDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
@@ -78,7 +78,7 @@ void ToneMappingDeferred::configure(const Config& configuration) { · 11 unmodified lines
7878 }
7979
8080 void ToneMappingDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
81− _toneMappingEffect.render(renderContext->getArgs());
81+ _toneMappingEffect.render(renderContext->args);
8282 }
8383
8484 RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
@@ -167,17 +167,14 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 82 unmodified lines
167167
168168
169169 // Is it possible that we render without a viewFrustum ?
170− if (!(renderContext->getArgs() && renderContext->getArgs()->_viewFrustum)) {
170+ if (!(renderContext->args && renderContext->args->_viewFrustum)) {
171171 return;
172172 }
173173
174− setAntialiasingStatus(renderContext->getFxaaStatus());
175− // TODO: Allow runtime manipulation of culling ShouldRenderFunctor
176−
177174 // TODO: For now, lighting is controlled through a singleton, so it is distinct
178175 DependencyManager::get<DeferredLightingEffect>()->setShadowMapStatus(renderContext->getShadowMapStatus());
179176
180− renderContext->getArgs()->_context->syncCache();
177+ renderContext->args->_context->syncCache();
181178
182179 for (auto job : _jobs) {
183180 job.run(sceneContext, renderContext);
@@ -185,12 +182,12 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 1 unmodified line
185182 };
186183
187184 void DrawDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemIDsBounds& inItems) {
188− assert(renderContext->getArgs());
189− assert(renderContext->getArgs()->_viewFrustum);
185+ assert(renderContext->args);
186+ assert(renderContext->args->_viewFrustum);
190187
191188 auto& config = std::static_pointer_cast<Config>(renderContext->jobConfig);
192189
193− RenderArgs* args = renderContext->getArgs();
190+ RenderArgs* args = renderContext->args;
194191 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
195192 batch.setViewportTransform(args->_viewport);
196193 batch.setStateScissorRect(args->_viewport);
@@ -230,8 +227,8 @@ const gpu::PipelinePointer& DrawOverlay3D::getOpaquePipeline() { · 33 unmodified lines
230227 }
231228
232229 void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
233− assert(renderContext->getArgs());
234− assert(renderContext->getArgs()->_viewFrustum);
230+ assert(renderContext->args);
231+ assert(renderContext->args->_viewFrustum);
235232
236233 // render backgrounds
237234 auto& scene = sceneContext->_scene;
@@ -251,7 +248,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 13 unmodified lines
251248 config->numDrawn = (int)inItems.size();
252249
253250 if (!inItems.empty()) {
254− RenderArgs* args = renderContext->getArgs();
251+ RenderArgs* args = renderContext->args;
255252
256253 // Clear the framebuffer without stereo
257254 // Needs to be distinct from the other batch because using the clear call
@@ -309,11 +306,11 @@ const gpu::PipelinePointer& DrawStencilDeferred::getOpaquePipeline() { · 51 unmodified lines
309306 }
310307
311308 void DrawStencilDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
312− assert(renderContext->getArgs());
313− assert(renderContext->getArgs()->_viewFrustum);
309+ assert(renderContext->args);
310+ assert(renderContext->args->_viewFrustum);
314311
315312 // from the touched pixel generate the stencil buffer
316− RenderArgs* args = renderContext->getArgs();
313+ RenderArgs* args = renderContext->args;
317314 doInBatch(args->_context, [&](gpu::Batch& batch) {
318315 args->_batch = &batch;
319316
@@ -335,8 +332,8 @@ void DrawStencilDeferred::run(const SceneContextPointer& sceneContext, const Ren · 15 unmodified lines
335332 }
336333
337334 void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
338− assert(renderContext->getArgs());
339− assert(renderContext->getArgs()->_viewFrustum);
335+ assert(renderContext->args);
336+ assert(renderContext->args->_viewFrustum);
340337
341338 // render backgrounds
342339 auto& scene = sceneContext->_scene;
@@ -348,7 +345,7 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const · 5 unmodified lines
348345 for (auto id : items) {
349346 inItems.emplace_back(id);
350347 }
351− RenderArgs* args = renderContext->getArgs();
348+ RenderArgs* args = renderContext->args;
352349 doInBatch(args->_context, [&](gpu::Batch& batch) {
353350 args->_batch = &batch;
354351
@@ -375,10 +372,10 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const · 20 unmodified lines
375372 }
376373
377374 void Blit::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
378− assert(renderContext->getArgs());
379− assert(renderContext->getArgs()->_context);
375+ assert(renderContext->args);
376+ assert(renderContext->args->_context);
380377
381− RenderArgs* renderArgs = renderContext->getArgs();
378+ RenderArgs* renderArgs = renderContext->args;
382379 auto blitFbo = renderArgs->_blitFramebuffer;
383380
384381 if (!blitFbo) {