History

add locks and explicitly copy ViewFrustums

Andrew Meadows committed 10 years ago

Commit 71b2d641 parent bcf2cc811 files · +148 −86Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+3−3
@@ -202,7 +202,7 @@ void DrawDeferred::run(const SceneContextPointer& sceneContext, const RenderCont · 201 unmodified lines
202202
203203 void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inItems) {
204204 assert(renderContext->args);
205− assert(renderContext->args->_viewFrustum);
205+ assert(renderContext->args->hasViewFrustum());
206206
207207 auto config = std::static_pointer_cast<Config>(renderContext->jobConfig);
208208
@@ -215,8 +215,8 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 6 unmodified lines
215215
216216 glm::mat4 projMat;
217217 Transform viewMat;
218− args->_viewFrustum->evalProjectionMatrix(projMat);
219− args->_viewFrustum->evalViewTransform(viewMat);
218+ args->getViewFrustum().evalProjectionMatrix(projMat);
219+ args->getViewFrustum().evalViewTransform(viewMat);
220220
221221 batch.setProjectionTransform(projMat);
222222 batch.setViewTransform(viewMat);