History

Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass

samcake committed 11 years ago

Commit 84b70fb2 parents 49abbe2 e3c06a3198 files · +4930 −3673Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+11−0
@@ -17,6 +17,8 @@ · 16 unmodified lines
1717 #include "RenderArgs.h"
1818 #include "TextureCache.h"
1919
20+#include "render/DrawStatus.h"
21+
2022 #include <PerfStat.h>
2123
2224 #include "overlay3D_vert.h"
@@ -50,6 +52,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 27 unmodified lines
5052 )));
5153 _jobs.push_back(Job(new CullItems::JobModel("CullOpaque", _jobs.back().getOutput())));
5254 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortOpaque", _jobs.back().getOutput())));
55+ auto& renderedOpaques = _jobs.back().getOutput();
5356 _jobs.push_back(Job(new DrawOpaqueDeferred::JobModel("DrawOpaqueDeferred", _jobs.back().getOutput())));
5457 _jobs.push_back(Job(new DrawLight::JobModel("DrawLight")));
5558 _jobs.push_back(Job(new ResetGLState::JobModel()));
@@ -66,6 +69,11 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 10 unmodified lines
6669 _jobs.push_back(Job(new CullItems::JobModel("CullTransparent", _jobs.back().getOutput())));
6770 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortTransparent", _jobs.back().getOutput(), DepthSortItems(false))));
6871 _jobs.push_back(Job(new DrawTransparentDeferred::JobModel("TransparentDeferred", _jobs.back().getOutput())));
72+
73+ _jobs.push_back(Job(new render::DrawStatus::JobModel("DrawStatus", renderedOpaques)));
74+ _jobs.back().setEnabled(false);
75+ _drawStatusJobIndex = _jobs.size() - 1;
76+
6977 _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D")));
7078 _jobs.push_back(Job(new ResetGLState::JobModel()));
7179 }
@@ -86,6 +94,9 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 14 unmodified lines
8694 return;
8795 }
8896
97+ // Make sure we turn the displayItemStatus on/off
98+ setDrawItemStatus(renderContext->_drawItemStatus);
99+
89100 renderContext->args->_context->syncCache();
90101
91102 for (auto job : _jobs) {