History

Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing

howard-stearns committed 10 years ago

Commit 830dcb52 parents 8a77e2e e41c49b47 files · +344 −413Browse files

Showing the changes to interface/src/Application.cpp (1 of 47 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1600,7 +1600,7 @@ void Application::paintGL() { · 1599 unmodified lines
1600 Stats::getInstance()->setRenderDetails(renderArgs._details);1600 Stats::getInstance()->setRenderDetails(renderArgs._details);
1601 // Reset the gpu::Context Stages1601 // Reset the gpu::Context Stages
1602 // Back to the default framebuffer;1602 // Back to the default framebuffer;
1603 gpu::doInBatch(renderArgs._context, [=](gpu::Batch& batch) {1603 gpu::doInBatch(renderArgs._context, [&](gpu::Batch& batch) {
1604 batch.resetStages();1604 batch.resetStages();
1605 });1605 });
1606 }1606 }
@@ -3618,7 +3618,7 @@ namespace render { · 2011 unmodified lines
3618 PerformanceTimer perfTimer("worldBox");3618 PerformanceTimer perfTimer("worldBox");
3619 3619
3620 auto& batch = *args->_batch;3620 auto& batch = *args->_batch;
3621 DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch);3621 DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
3622 renderWorldBox(batch);3622 renderWorldBox(batch);
3623 }3623 }
3624 }3624 }