Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all
Unified · Split
| @@ -69,7 +69,6 @@ · 68 unmodified lines | |||
| 69 | #include <FramebufferCache.h> | 69 | #include <FramebufferCache.h> |
| 70 | #include <gpu/Batch.h> | 70 | #include <gpu/Batch.h> |
| 71 | #include <gpu/Context.h> | 71 | #include <gpu/Context.h> |
| 72 | #include <gpu/DoInBatch.h> | ||
| 73 | #include <gpu/GLBackend.h> | 72 | #include <gpu/GLBackend.h> |
| 74 | #include <HFActionEvent.h> | 73 | #include <HFActionEvent.h> |
| 75 | #include <HFBackEvent.h> | 74 | #include <HFBackEvent.h> |
| @@ -1087,12 +1086,11 @@ void Application::paintGL() { · 1011 unmodified lines | |||
| 1087 | auto mirrorRectDest = glm::ivec4(mirrorRect.z, mirrorRect.y, mirrorRect.x, mirrorRect.w); | 1086 | auto mirrorRectDest = glm::ivec4(mirrorRect.z, mirrorRect.y, mirrorRect.x, mirrorRect.w); |
| 1088 | 1087 | ||
| 1089 | auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer(); | 1088 | auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer(); |
| 1090 | doInBatch(&renderArgs, [=](gpu::Batch& batch) { | 1089 | doInBatch(renderArgs._context, [=](gpu::Batch& batch) { |
| 1091 | batch.setFramebuffer(selfieFbo); | 1090 | batch.setFramebuffer(selfieFbo); |
| 1092 | batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f)); | 1091 | batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f)); |
| 1093 | batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest); | 1092 | batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest); |
| 1094 | batch.setFramebuffer(nullptr); | 1093 | batch.setFramebuffer(nullptr); |
| 1095 | renderArgs._context->render(batch); | ||
| 1096 | }); | 1094 | }); |
| 1097 | } | 1095 | } |
| 1098 | } | 1096 | } |
| @@ -1217,7 +1215,7 @@ void Application::paintGL() { · 118 unmodified lines | |||
| 1217 | } | 1215 | } |
| 1218 | displaySide(&renderArgs, _myCamera); | 1216 | displaySide(&renderArgs, _myCamera); |
| 1219 | renderArgs._context->enableStereo(false); | 1217 | renderArgs._context->enableStereo(false); |
| 1220 | doInBatch(&renderArgs, [](gpu::Batch& batch) { | 1218 | doInBatch(renderArgs._context, [](gpu::Batch& batch) { |
| 1221 | batch.setFramebuffer(nullptr); | 1219 | batch.setFramebuffer(nullptr); |
| 1222 | }); | 1220 | }); |
| 1223 | } | 1221 | } |
| @@ -1281,7 +1279,7 @@ void Application::paintGL() { · 57 unmodified lines | |||
| 1281 | 1279 | ||
| 1282 | // Reset the gpu::Context Stages | 1280 | // Reset the gpu::Context Stages |
| 1283 | // Back to the default framebuffer; | 1281 | // Back to the default framebuffer; |
| 1284 | doInBatch(&renderArgs, [=](gpu::Batch& batch) { | 1282 | doInBatch(renderArgs._context, [=](gpu::Batch& batch) { |
| 1285 | batch.resetStages(); | 1283 | batch.resetStages(); |
| 1286 | }); | 1284 | }); |
| 1287 | } | 1285 | } |