History

combine snapshotOperator lists per sam's suggestions

SamGondelman committed 7 years ago

Commit 4fc97ef1 parent 06fbc847 files · +18 −38Browse files

Showing the changes to interface/src/graphics/GraphicsEngine.cpp (1 of 7 files). Show all

Unified · Split

interface/src/graphics/GraphicsEngine.cpp+0−3
@@ -245,7 +245,6 @@ void GraphicsEngine::render_performFrame() { · 244 unmodified lines
245 }245 }
246 246
247 std::queue<Application::SnapshotOperator> snapshotOperators;247 std::queue<Application::SnapshotOperator> snapshotOperators;
248 std::queue<Application::SecondarySnapshotOperator> secondarySnapshotOperators;
249 if (!_programsCompiled.load()) {248 if (!_programsCompiled.load()) {
250 gpu::doInBatch("splashFrame", _gpuContext, [&](gpu::Batch& batch) {249 gpu::doInBatch("splashFrame", _gpuContext, [&](gpu::Batch& batch) {
251 batch.setFramebuffer(finalFramebuffer);250 batch.setFramebuffer(finalFramebuffer);
@@ -274,7 +273,6 @@ void GraphicsEngine::render_performFrame() { · 22 unmodified lines
274 renderArgs._hudOperator = displayPlugin->getHUDOperator();273 renderArgs._hudOperator = displayPlugin->getHUDOperator();
275 renderArgs._hudTexture = qApp->getApplicationOverlay().getOverlayTexture();274 renderArgs._hudTexture = qApp->getApplicationOverlay().getOverlayTexture();
276 renderArgs._takingSnapshot = qApp->takeSnapshotOperators(snapshotOperators);275 renderArgs._takingSnapshot = qApp->takeSnapshotOperators(snapshotOperators);
277 qApp->takeSecondarySnapshotOperators(secondarySnapshotOperators);
278 renderArgs._blitFramebuffer = finalFramebuffer;276 renderArgs._blitFramebuffer = finalFramebuffer;
279 render_runRenderFrame(&renderArgs);277 render_runRenderFrame(&renderArgs);
280 }278 }
@@ -290,7 +288,6 @@ void GraphicsEngine::render_performFrame() { · 9 unmodified lines
290 }288 }
291 };289 };
292 frame->snapshotOperators = snapshotOperators;290 frame->snapshotOperators = snapshotOperators;
293 frame->secondarySnapshotOperators = secondarySnapshotOperators;
294 // deliver final scene rendering commands to the display plugin291 // deliver final scene rendering commands to the display plugin
295 {292 {
296 PROFILE_RANGE(render, "/pluginOutput");293 PROFILE_RANGE(render, "/pluginOutput");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t