History

made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility

Anna committed 7 years ago

Commit f5840091 parent 0cd532a7 files · +23 −19Browse files

Showing the changes to libraries/render-utils/src/ToneMapAndResampleTask.cpp (1 of 7 files). Show all

Unified · Split

libraries/render-utils/src/ToneMapAndResampleTask.cpp+7−7
@@ -68,13 +68,13 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 67 unmodified lines
6868 RenderArgs* args = renderContext->args;
6969
7070 auto lightingBuffer = input.get0()->getRenderBuffer(0);
71− auto resampledFramebuffer = input.get1();
71+ auto destinationFramebuffer = input.get1();
7272
73− if (!resampledFramebuffer) {
74− resampledFramebuffer = args->_blitFramebuffer;
73+ if (!destinationFramebuffer) {
74+ destinationFramebuffer = args->_blitFramebuffer;
7575 }
7676
77− if (!lightingBuffer || !resampledFramebuffer) {
77+ if (!lightingBuffer || !destinationFramebuffer) {
7878 return;
7979 }
8080
@@ -82,7 +82,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 1 unmodified line
8282 init();
8383 }
8484
85− const auto bufferSize = resampledFramebuffer->getSize();
85+ const auto bufferSize = destinationFramebuffer->getSize();
8686
8787 auto srcBufferSize = glm::ivec2(lightingBuffer->getDimensions());
8888
@@ -90,7 +90,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 1 unmodified line
9090
9191 gpu::doInBatch("Resample::run", args->_context, [&](gpu::Batch& batch) {
9292 batch.enableStereo(false);
93− batch.setFramebuffer(resampledFramebuffer);
93+ batch.setFramebuffer(destinationFramebuffer);
9494
9595 batch.setViewportTransform(destViewport);
9696 batch.setProjectionTransform(glm::mat4());
@@ -106,5 +106,5 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 9 unmodified lines
106106 // Set full final viewport
107107 args->_viewport = destViewport;
108108
109− output = resampledFramebuffer;
109+ output = destinationFramebuffer;
110110 }

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