Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some typos from merge

Browse source
This commit is contained in:
Anna 2019-07-29 11:55:12 -07:00
parent 0cc8c1f434
commit db49a0b9d6
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -140,29 +140,18 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs); task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs);
} }
#if !defined(Q_OS_ANDROID)
// Just resolve the msaa
const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
//const auto toneMappedBuffer = resolvedFramebuffer;
#else
const auto newResolvedFramebuffer = task.addJob<NewFramebuffer>("MakeResolvingFramebuffer"); const auto newResolvedFramebuffer = task.addJob<NewFramebuffer>("MakeResolvingFramebuffer");
// Just resolve the msaa #if 1
const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
#else
const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying(); const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying();
#endif
const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs); const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
// Lighting Buffer ready for tone mapping //const auto toneMappingInputs = ToneMappingDeferred::Input(resolvedFramebuffer, args->blitFramebuffer).asVarying();
// Forward rendering on GLES doesn't support tonemapping to and from the same FBO, so we specify const auto toneMappedBuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", resolvedFramebuffer);
// the output FBO as null, which causes the tonemapping to target the blit framebuffer
//const auto toneMappingInputs = ToneMappingDeferred::Input(resolvedFramebuffer, resolvedFramebuffer).asVarying();
//const auto toneMappedBuffer = task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
#endif
const auto primaryFramebuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", resolvedFramebuffer);
// HUD Layer // HUD Layer
const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(toneMappedBuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying(); const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(toneMappedBuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying();

6
libraries/render-utils/src/ToneMapAndResampleTask.cpp
View file

@ -73,7 +73,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
resampledFrameBuffer = args->_blitFramebuffer; resampledFrameBuffer = args->_blitFramebuffer;
if (!lightingBuffer || !blitFramebuffer) { if (!lightingBuffer || !resampledFramebuffer) {
return; return;
} }
@ -105,8 +105,6 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
}); });
// Set full final viewport // Set full final viewport
args->_viewport = viewport; args->_viewport = destViewport;
output = blitFramebuffer;
} }
} }