History

more overlay wip

SamGondelman committed 7 years ago

Commit 5ce8f561 parent ca8d64b62 files · +620 −864Browse files

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

Unified · Split

libraries/render-utils/src/RenderCommonTask.cpp+4−4
@@ -45,13 +45,13 @@ void EndGPURangeTimer::run(const render::RenderContextPointer& renderContext, co · 44 unmodified lines
4545 config->setGPUBatchRunTime(timer->getGPUAverage(), timer->getBatchAverage());
4646 }
4747
48−DrawOverlay3D::DrawOverlay3D(bool opaque) :
48+DrawLayered3D::DrawLayered3D(bool opaque) :
4949 _shapePlumber(std::make_shared<ShapePlumber>()),
5050 _opaquePass(opaque) {
5151 initForwardPipelines(*_shapePlumber);
5252 }
5353
54−void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs& inputs) {
54+void DrawLayered3D::run(const RenderContextPointer& renderContext, const Inputs& inputs) {
5555 assert(renderContext->args);
5656 assert(renderContext->args->hasViewFrustum());
5757
@@ -70,7 +70,7 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs& · 12 unmodified lines
7070 // Needs to be distinct from the other batch because using the clear call
7171 // while stereo is enabled triggers a warning
7272 if (_opaquePass) {
73− gpu::doInBatch("DrawOverlay3D::run::clear", args->_context, [&](gpu::Batch& batch) {
73+ gpu::doInBatch("DrawLayered3D::run::clear", args->_context, [&](gpu::Batch& batch) {
7474 batch.enableStereo(false);
7575 batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0, false);
7676 });
@@ -78,7 +78,7 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs& · 1 unmodified line
7878
7979 if (!inItems.empty()) {
8080 // Render the items
81− gpu::doInBatch("DrawOverlay3D::main", args->_context, [&](gpu::Batch& batch) {
81+ gpu::doInBatch("DrawLayered3D::main", args->_context, [&](gpu::Batch& batch) {
8282 args->_batch = &batch;
8383 batch.setViewportTransform(args->_viewport);
8484 batch.setStateScissorRect(args->_viewport);