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
915 });915 });
916}916}
917 917
918template<typename F>
919void doInBatch(RenderArgs* args, F f) {
920 gpu::Batch batch;
921 f(batch);
922 args->_context->render(batch);
923}
924
918void Application::paintGL() {925void Application::paintGL() {
919 PROFILE_RANGE(__FUNCTION__);926 PROFILE_RANGE(__FUNCTION__);
920 auto displayPlugin = getActiveDisplayPlugin();927 auto displayPlugin = getActiveDisplayPlugin();
@@ -1009,29 +1016,27 @@ void Application::paintGL() { · 88 unmodified lines
1009 QSize size = textureCache->getFrameBufferSize();1016 QSize size = textureCache->getFrameBufferSize();
1010 {1017 {
1011 PROFILE_RANGE(__FUNCTION__ "/mainRender");1018 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 }
1012 1037
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
1034 if (displayPlugin->isStereo()) {1038 if (displayPlugin->isStereo()) {
1039 PROFILE_RANGE(__FUNCTION__ "/stereoRender");
1035 QRect r(QPoint(0, 0), QSize(size.width() / 2, size.height()));1040 QRect r(QPoint(0, 0), QSize(size.width() / 2, size.height()));
1036 glEnable(GL_SCISSOR_TEST);1041 glEnable(GL_SCISSOR_TEST);
1037 for_each_eye([&](Eye eye){1042 for_each_eye([&](Eye eye){
@@ -1039,8 +1044,11 @@ void Application::paintGL() { · 1 unmodified line
1039 Camera eyeCamera;1044 Camera eyeCamera;
1040 eyeCamera.setTransform(displayPlugin->getModelview(eye, _myCamera.getTransform()));1045 eyeCamera.setTransform(displayPlugin->getModelview(eye, _myCamera.getTransform()));
1041 eyeCamera.setProjection(displayPlugin->getProjection(eye, _myCamera.getProjection()));1046 eyeCamera.setProjection(displayPlugin->getProjection(eye, _myCamera.getProjection()));
1042 1047 renderArgs._viewport = gpu::Vec4i(r.x(), r.y(), r.width(), r.height());
1043 clearLambda(glm::ivec4(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 });
1044 displaySide(&renderArgs, eyeCamera);1052 displaySide(&renderArgs, eyeCamera);
1045 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && 1053 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) &&
1046 !Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {1054 !Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
@@ -1051,7 +1059,13 @@ void Application::paintGL() { · 4 unmodified lines
1051 });1059 });
1052 glDisable(GL_SCISSOR_TEST);1060 glDisable(GL_SCISSOR_TEST);
1053 } else {1061 } 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 });
1055 displaySide(&renderArgs, _myCamera);1069 displaySide(&renderArgs, _myCamera);
1056 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && 1070 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror) &&
1057 !Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {1071 !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