History

merge old work

HifiExperiments committed 2 years ago

Commit 56f697e1 parent 1fe2fc5165 files · +2635 −1993Browse files

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

Unified · Split

libraries/render-utils/src/DeferredFramebuffer.cpp+34−6
@@ -10,6 +10,11 @@ · 9 unmodified lines
1010 //
1111 #include "DeferredFramebuffer.h"
1212
13+#include "DeferredBufferWrite_shared.slh"
14+
15+#include "gpu/Batch.h"
16+#include "gpu/Context.h"
17+
1318
1419 DeferredFramebuffer::DeferredFramebuffer() {
1520 }
@@ -36,8 +41,10 @@ void DeferredFramebuffer::updatePrimaryDepth(const gpu::TexturePointer& depthBuf · 20 unmodified lines
3641 _deferredColorTexture.reset();
3742 _deferredNormalTexture.reset();
3843 _deferredSpecularTexture.reset();
44+ _deferredVelocityTexture.reset();
3945 _lightingTexture.reset();
4046 _lightingFramebuffer.reset();
47+ _lightingWithVelocityFramebuffer.reset();
4148 }
4249 }
4350
@@ -46,8 +53,9 @@ void DeferredFramebuffer::allocate() { · 2 unmodified lines
4653 _deferredFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("deferred"));
4754 _deferredFramebufferDepthColor = gpu::FramebufferPointer(gpu::Framebuffer::create("deferredDepthColor"));
4855
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);
5159 auto width = _frameSize.x;
5260 auto height = _frameSize.y;
5361
@@ -56,10 +64,12 @@ void DeferredFramebuffer::allocate() { · 2 unmodified lines
5664 _deferredColorTexture = gpu::Texture::createRenderBuffer(colorFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler);
5765 _deferredNormalTexture = gpu::Texture::createRenderBuffer(linearFormat, width, height, gpu::Texture::SINGLE_MIP, defaultSampler);
5866 _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);
5968
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);
6373
6474 _deferredFramebufferDepthColor->setRenderBuffer(0, _deferredColorTexture);
6575
@@ -80,8 +90,12 @@ void DeferredFramebuffer::allocate() { · 14 unmodified lines
8090 _lightingFramebuffer->setRenderBuffer(0, _lightingTexture);
8191 _lightingFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
8292
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);
8497
98+ _deferredFramebuffer->setRenderBuffer(DEFERRED_LIGHTING_SLOT, _lightingTexture);
8599 }
86100
87101
@@ -127,6 +141,13 @@ gpu::TexturePointer DeferredFramebuffer::getDeferredSpecularTexture() { · 39 unmodified lines
127141 return _deferredSpecularTexture;
128142 }
129143
144+gpu::TexturePointer DeferredFramebuffer::getDeferredVelocityTexture() {
145+ if (!_deferredVelocityTexture) {
146+ allocate();
147+ }
148+ return _deferredVelocityTexture;
149+}
150+
130151 gpu::FramebufferPointer DeferredFramebuffer::getLightingFramebuffer() {
131152 if (!_lightingFramebuffer) {
132153 allocate();
@@ -134,6 +155,13 @@ gpu::FramebufferPointer DeferredFramebuffer::getLightingFramebuffer() { · 1 unmodified line
134155 return _lightingFramebuffer;
135156 }
136157
158+gpu::FramebufferPointer DeferredFramebuffer::getLightingWithVelocityFramebuffer() {
159+ if (!_lightingWithVelocityFramebuffer) {
160+ allocate();
161+ }
162+ return _lightingWithVelocityFramebuffer;
163+}
164+
137165 gpu::TexturePointer DeferredFramebuffer::getLightingTexture() {
138166 if (!_lightingTexture) {
139167 allocate();

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