History

Revert "Revert "Mirrors + Portals""

Dale Glass committed 2 years ago

Commit e7591d61 parent b33d35c81 files · +1047 −263Browse files

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

Unified · Split

libraries/render-utils/src/ToneMapAndResampleTask.cpp+4−2
@@ -25,9 +25,10 @@ using namespace shader::render_utils::program; · 24 unmodified lines
25gpu::PipelinePointer ToneMapAndResample::_pipeline;25gpu::PipelinePointer ToneMapAndResample::_pipeline;
26gpu::PipelinePointer ToneMapAndResample::_mirrorPipeline;26gpu::PipelinePointer ToneMapAndResample::_mirrorPipeline;
27 27
28ToneMapAndResample::ToneMapAndResample() {28ToneMapAndResample::ToneMapAndResample(size_t depth) {
29 Parameters parameters;29 Parameters parameters;
30 _parametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Parameters), (const gpu::Byte*) &parameters));30 _parametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Parameters), (const gpu::Byte*) &parameters));
31 _depth = depth;
31}32}
32 33
33void ToneMapAndResample::init() {34void ToneMapAndResample::init() {
@@ -95,7 +96,8 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 61 unmodified lines
95 batch.setViewportTransform(destViewport);96 batch.setViewportTransform(destViewport);
96 batch.setProjectionTransform(glm::mat4());97 batch.setProjectionTransform(glm::mat4());
97 batch.resetViewTransform();98 batch.resetViewTransform();
98 batch.setPipeline(args->_renderMode == RenderArgs::MIRROR_RENDER_MODE ? _mirrorPipeline : _pipeline);99 bool shouldMirror = args->_numMirrorFlips >= (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE);
100 batch.setPipeline(shouldMirror ? _mirrorPipeline : _pipeline);
99 101
100 batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(srcBufferSize, args->_viewport));102 batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(srcBufferSize, args->_viewport));
101 batch.setUniformBuffer(render_utils::slot::buffer::ToneMappingParams, _parametersBuffer);103 batch.setUniformBuffer(render_utils::slot::buffer::ToneMappingParams, _parametersBuffer);