History

Current state

samcake committed 10 years ago

Commit 414c43c1 parent 93eb60813 files · +396 −287Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+11−8
@@ -113,20 +113,22 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) { · 112 unmodified lines
113113 // Opaque all rendered, generate surface geometry buffers
114114 const auto curvatureFramebufferAndDepth = addJob<SurfaceGeometryPass>("SurfaceGeometry", deferredFrameTransform);
115115
116− addJob<render::BlurGaussianDepthAware>("DiffuseCurvature", curvatureFramebufferAndDepth);
117−
116+#define SIMPLE_BLUR 1
117+#if SIMPLE_BLUR
118+ const auto curvatureFramebuffer = addJob<render::BlurGaussian>("DiffuseCurvature", curvatureFramebufferAndDepth.get<SurfaceGeometryPass::Outputs>().first);
119+ const auto diffusedCurvatureFramebuffer = addJob<render::BlurGaussian>("DiffuseCurvature2", curvatureFramebufferAndDepth.get<SurfaceGeometryPass::Outputs>().first, true);
120+#else
121+ const auto curvatureFramebuffer = addJob<render::BlurGaussianDepthAware>("DiffuseCurvature", curvatureFramebufferAndDepth);
118122 const auto diffusedCurvatureFramebuffer = addJob<render::BlurGaussianDepthAware>("DiffuseCurvature2", curvatureFramebufferAndDepth, true);
119−
123+#endif
124+
120125 // AO job
121126 addJob<AmbientOcclusionEffect>("AmbientOcclusion");
122127
123128 // Draw Lights just add the lights to the current list of lights to deal with. NOt really gpu job for now.
124129 addJob<DrawLight>("DrawLight", lights);
125130
126− curvatureFramebufferAndDepth.get<SurfaceGeometryPass::Outputs>().first;
127−
128− // const auto scatteringInputs = render::Varying(SubsurfaceScattering::Inputs(deferredFrameTransform, curvatureFramebufferAndDepth[0]));
129− const auto scatteringInputs = render::Varying(SubsurfaceScattering::Inputs(deferredFrameTransform, curvatureFramebufferAndDepth.get<SurfaceGeometryPass::Outputs>().first));
131+ const auto scatteringInputs = render::Varying(SubsurfaceScattering::Inputs(deferredFrameTransform, curvatureFramebuffer, diffusedCurvatureFramebuffer));
130132 const auto scatteringFramebuffer = addJob<SubsurfaceScattering>("Scattering", scatteringInputs);
131133
132134 // DeferredBuffer is complete, now let's shade it into the LightingBuffer
@@ -150,7 +152,8 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) { · 17 unmodified lines
150152 // Debugging stages
151153 {
152154 // Debugging Deferred buffer job
153− addJob<DebugDeferredBuffer>("DebugDeferredBuffer", scatteringFramebuffer);
155+ const auto debugFramebuffers = render::Varying(DebugDeferredBuffer::Inputs(diffusedCurvatureFramebuffer, scatteringFramebuffer));
156+ addJob<DebugDeferredBuffer>("DebugDeferredBuffer", debugFramebuffers);
154157
155158 // Scene Octree Debuging job
156159 {

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