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
245245 }
246246
247247 std::queue<Application::SnapshotOperator> snapshotOperators;
248− std::queue<Application::SecondarySnapshotOperator> secondarySnapshotOperators;
249248 if (!_programsCompiled.load()) {
250249 gpu::doInBatch("splashFrame", _gpuContext, [&](gpu::Batch& batch) {
251250 batch.setFramebuffer(finalFramebuffer);
@@ -274,7 +273,6 @@ void GraphicsEngine::render_performFrame() { · 22 unmodified lines
274273 renderArgs._hudOperator = displayPlugin->getHUDOperator();
275274 renderArgs._hudTexture = qApp->getApplicationOverlay().getOverlayTexture();
276275 renderArgs._takingSnapshot = qApp->takeSnapshotOperators(snapshotOperators);
277− qApp->takeSecondarySnapshotOperators(secondarySnapshotOperators);
278276 renderArgs._blitFramebuffer = finalFramebuffer;
279277 render_runRenderFrame(&renderArgs);
280278 }
@@ -290,7 +288,6 @@ void GraphicsEngine::render_performFrame() { · 9 unmodified lines
290288 }
291289 };
292290 frame->snapshotOperators = snapshotOperators;
293− frame->secondarySnapshotOperators = secondarySnapshotOperators;
294291 // deliver final scene rendering commands to the display plugin
295292 {
296293 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