History

Working on batch

Brad Davis committed 11 years ago

Commit 9fd80d71 parent 57442001 file · +38 −24Browse files

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

Unified · Split

interface/src/Application.cpp+38−24
@@ -915,6 +915,13 @@ void Application::initializeUi() { · 914 unmodified lines
915915 });
916916 }
917917
918+template<typename F>
919+void doInBatch(RenderArgs* args, F f) {
920+ gpu::Batch batch;
921+ f(batch);
922+ args->_context->render(batch);
923+}
924+
918925 void Application::paintGL() {
919926 PROFILE_RANGE(__FUNCTION__);
920927 auto displayPlugin = getActiveDisplayPlugin();
@@ -1009,29 +1016,27 @@ void Application::paintGL() { · 88 unmodified lines
10091016 QSize size = textureCache->getFrameBufferSize();
10101017 {
10111018 PROFILE_RANGE(__FUNCTION__ "/mainRender");
1019+ {
1020+ PROFILE_RANGE(__FUNCTION__ "/clear");
1021+ doInBatch(&renderArgs, [&](gpu::Batch& batch) {
1022+ batch.setFramebuffer(textureCache->getPrimaryFramebuffer());
1023+ // clear the normal and specular buffers
1024+ batch.clearFramebuffer(
1025+ gpu::Framebuffer::BUFFER_COLOR0 |
1026+ gpu::Framebuffer::BUFFER_COLOR1 |
1027+ gpu::Framebuffer::BUFFER_COLOR2 |
1028+ gpu::Framebuffer::BUFFER_DEPTH,
1029+ vec4(vec3(0), 1), 1.0, 0.0, true);
1030+ batch.clearColorFramebuffer(
1031+ gpu::Framebuffer::BUFFER_COLOR0 |
1032+ gpu::Framebuffer::BUFFER_COLOR1 |
1033+ gpu::Framebuffer::BUFFER_COLOR2,
1034+ vec4(vec3(0), 1));
1035+ });
1036+ }
10121037
1013− auto clearLambda = [&](const gpu::Vec4i& vp) {
1014− gpu::Batch batch;
1015− auto primaryFbo = textureCache->getPrimaryFramebuffer();
1016− batch.setFramebuffer(primaryFbo);
1017− // Viewport is assigned to the size of the framebuffer
1018− renderArgs._viewport = vp;
1019− batch.setViewportTransform(renderArgs._viewport);
1020− batch.setStateScissorRect(renderArgs._viewport);
1021−
1022− // clear the normal and specular buffers
1023− batch.clearFramebuffer(
1024− gpu::Framebuffer::BUFFER_COLOR0 |
1025− gpu::Framebuffer::BUFFER_COLOR1 |
1026− gpu::Framebuffer::BUFFER_COLOR2 |
1027− gpu::Framebuffer::BUFFER_DEPTH,
1028− vec4(vec3(0), 1), 1.0, 0.0, true);
1029−
1030− renderArgs._context->render(batch);
1031− };
1032−
1033−
10341038 if (displayPlugin->isStereo()) {
1039+ PROFILE_RANGE(__FUNCTION__ "/stereoRender");
10351040 QRect r(QPoint(0, 0), QSize(size.width() / 2, size.height()));
10361041 glEnable(GL_SCISSOR_TEST);
10371042 for_each_eye([&](Eye eye){
@@ -1039,8 +1044,11 @@ void Application::paintGL() { · 1 unmodified line
10391044 Camera eyeCamera;
10401045 eyeCamera.setTransform(displayPlugin->getModelview(eye, _myCamera.getTransform()));
10411046 eyeCamera.setProjection(displayPlugin->getProjection(eye, _myCamera.getProjection()));
1042−
1043− clearLambda(glm::ivec4(r.x(), r.y(), r.width(), r.height()));
1047+ renderArgs._viewport = gpu::Vec4i(r.x(), r.y(), r.width(), r.height());
1048+ doInBatch(&renderArgs, [&](gpu::Batch& batch) {
1049+ batch.setViewportTransform(renderArgs._viewport);
1050+ batch.setStateScissorRect(renderArgs._viewport);
1051+ });
10441052 displaySide(&renderArgs, eyeCamera);
10451053 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) &&
10461054 !Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
@@ -1051,7 +1059,13 @@ void Application::paintGL() { · 4 unmodified lines
10511059 });
10521060 glDisable(GL_SCISSOR_TEST);
10531061 } else {
1054− clearLambda(glm::ivec4(0, 0, size.width(), size.height()));
1062+ PROFILE_RANGE(__FUNCTION__ "/monoRender");
1063+ renderArgs._viewport = gpu::Vec4i(0, 0, size.width(), size.height());
1064+ // Viewport is assigned to the size of the framebuffer
1065+ doInBatch(&renderArgs, [&](gpu::Batch& batch) {
1066+ batch.setViewportTransform(renderArgs._viewport);
1067+ batch.setStateScissorRect(renderArgs._viewport);
1068+ });
10551069 displaySide(&renderArgs, _myCamera);
10561070 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) &&
10571071 !Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {

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