Showing the changes to libraries/render-utils/src/DeferredFramebuffer.cpp (1 of 165 files). Show all
Unified · Split
| @@ -10,6 +10,11 @@ · 9 unmodified lines | ||
| 10 | 10 | // |
| 11 | 11 | #include "DeferredFramebuffer.h" |
| 12 | 12 | |
| 13 | +#include "DeferredBufferWrite_shared.slh" | |
| 14 | + | |
| 15 | +#include "gpu/Batch.h" | |
| 16 | +#include "gpu/Context.h" | |
| 17 | + | |
| 13 | 18 | |
| 14 | 19 | DeferredFramebuffer::DeferredFramebuffer() { |
| 15 | 20 | } |
| @@ -36,8 +41,10 @@ void DeferredFramebuffer::updatePrimaryDepth(const gpu::TexturePointer& depthBuf · 20 unmodified lines | ||
| 36 | 41 | _deferredColorTexture.reset(); |
| 37 | 42 | _deferredNormalTexture.reset(); |
| 38 | 43 | _deferredSpecularTexture.reset(); |
| 44 | + _deferredVelocityTexture.reset(); | |
| 39 | 45 | _lightingTexture.reset(); |
| 40 | 46 | _lightingFramebuffer.reset(); |
| 47 | + _lightingWithVelocityFramebuffer.reset(); | |
| 41 | 48 | } |
| 42 | 49 | } |
| 43 | 50 | |
| @@ -46,8 +53,9 @@ void DeferredFramebuffer::allocate() { · 2 unmodified lines | ||
| 46 | 53 | _deferredFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("deferred")); |
| 47 | 54 | _deferredFramebufferDepthColor = gpu::FramebufferPointer(gpu::Framebuffer::create("deferredDepthColor")); |
| 48 | 55 | |
| 49 | − auto colorFormat = gpu::Element::COLOR_SRGBA_32; | |
| 50 | − auto linearFormat = gpu::Element::COLOR_RGBA_32; | |
| 56 | + const auto colorFormat = gpu::Element::COLOR_SRGBA_32; | |
| 57 | + const auto linearFormat = gpu::Element::COLOR_RGBA_32; | |
| 58 | + const auto halfFormat = gpu::Element(gpu::VEC2, gpu::HALF, gpu::XY); | |
| 51 | 59 | auto width = _frameSize.x; |
| 52 | 60 | auto height = _frameSize.y; |
| 53 | 61 | |
| @@ -56,10 +64,12 @@ void DeferredFramebuffer::allocate() { · 2 unmodified lines | ||
| 56 | 64 | _deferredColorTexture = gpu::Texture::createRenderBuffer(colorFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler); |
| 57 | 65 | _deferredNormalTexture = gpu::Texture::createRenderBuffer(linearFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler); |
| 58 | 66 | _deferredSpecularTexture = gpu::Texture::createRenderBuffer(linearFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler); |
| 67 | + _deferredVelocityTexture = gpu::Texture::createRenderBuffer(halfFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler); | |
| 59 | 68 | |
| 60 | − _deferredFramebuffer->setRenderBuffer(0, _deferredColorTexture); | |
| 61 | − _deferredFramebuffer->setRenderBuffer(1, _deferredNormalTexture); | |
| 62 | − _deferredFramebuffer->setRenderBuffer(2, _deferredSpecularTexture); | |
| 69 | + _deferredFramebuffer->setRenderBuffer(DEFERRED_COLOR_SLOT, _deferredColorTexture); | |
| 70 | + _deferredFramebuffer->setRenderBuffer(DEFERRED_NORMAL_SLOT, _deferredNormalTexture); | |
| 71 | + _deferredFramebuffer->setRenderBuffer(DEFERRED_SPECULAR_SLOT, _deferredSpecularTexture); | |
| 72 | + _deferredFramebuffer->setRenderBuffer(DEFERRED_VELOCITY_SLOT, _deferredVelocityTexture); | |
| 63 | 73 | |
| 64 | 74 | _deferredFramebufferDepthColor->setRenderBuffer(0, _deferredColorTexture); |
| 65 | 75 | |
| @@ -80,8 +90,12 @@ void DeferredFramebuffer::allocate() { · 14 unmodified lines | ||
| 80 | 90 | _lightingFramebuffer->setRenderBuffer(0, _lightingTexture); |
| 81 | 91 | _lightingFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat); |
| 82 | 92 | |
| 83 | − _deferredFramebuffer->setRenderBuffer(3, _lightingTexture); | |
| 93 | + _lightingWithVelocityFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("lighting_velocity")); | |
| 94 | + _lightingWithVelocityFramebuffer->setRenderBuffer(0, _lightingTexture); | |
| 95 | + _lightingWithVelocityFramebuffer->setRenderBuffer(1, _deferredVelocityTexture); | |
| 96 | + _lightingWithVelocityFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat); | |
| 84 | 97 | |
| 98 | + _deferredFramebuffer->setRenderBuffer(DEFERRED_LIGHTING_SLOT, _lightingTexture); | |
| 85 | 99 | } |
| 86 | 100 | |
| 87 | 101 | |
| @@ -127,6 +141,13 @@ gpu::TexturePointer DeferredFramebuffer::getDeferredSpecularTexture() { · 39 unmodified lines | ||
| 127 | 141 | return _deferredSpecularTexture; |
| 128 | 142 | } |
| 129 | 143 | |
| 144 | +gpu::TexturePointer DeferredFramebuffer::getDeferredVelocityTexture() { | |
| 145 | + if (!_deferredVelocityTexture) { | |
| 146 | + allocate(); | |
| 147 | + } | |
| 148 | + return _deferredVelocityTexture; | |
| 149 | +} | |
| 150 | + | |
| 130 | 151 | gpu::FramebufferPointer DeferredFramebuffer::getLightingFramebuffer() { |
| 131 | 152 | if (!_lightingFramebuffer) { |
| 132 | 153 | allocate(); |
| @@ -134,6 +155,13 @@ gpu::FramebufferPointer DeferredFramebuffer::getLightingFramebuffer() { · 1 unmodified line | ||
| 134 | 155 | return _lightingFramebuffer; |
| 135 | 156 | } |
| 136 | 157 | |
| 158 | +gpu::FramebufferPointer DeferredFramebuffer::getLightingWithVelocityFramebuffer() { | |
| 159 | + if (!_lightingWithVelocityFramebuffer) { | |
| 160 | + allocate(); | |
| 161 | + } | |
| 162 | + return _lightingWithVelocityFramebuffer; | |
| 163 | +} | |
| 164 | + | |
| 137 | 165 | gpu::TexturePointer DeferredFramebuffer::getLightingTexture() { |
| 138 | 166 | if (!_lightingTexture) { |
| 139 | 167 | allocate(); |