History

Merging with upstream master/graphics

samcake committed 10 years ago

Commit e70ab472 parents a50b14d c99ae5d8 files · +107 −75Browse files

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

Unified · Split

libraries/render-utils/src/FramebufferCache.cpp+7−7
@@ -33,7 +33,7 @@ void FramebufferCache::setFrameBufferSize(QSize frameBufferSize) { · 32 unmodified lines
33 //If the size changed, we need to delete our FBOs33 //If the size changed, we need to delete our FBOs
34 if (_frameBufferSize != frameBufferSize) {34 if (_frameBufferSize != frameBufferSize) {
35 _frameBufferSize = frameBufferSize;35 _frameBufferSize = frameBufferSize;
36 _primaryFramebufferDepthColor.reset();36 _primaryFramebuffer.reset();
37 _primaryDepthTexture.reset();37 _primaryDepthTexture.reset();
38 _primaryColorTexture.reset();38 _primaryColorTexture.reset();
39 _deferredFramebuffer.reset();39 _deferredFramebuffer.reset();
@@ -49,7 +49,7 @@ void FramebufferCache::setFrameBufferSize(QSize frameBufferSize) { · 9 unmodified lines
49}49}
50 50
51void FramebufferCache::createPrimaryFramebuffer() {51void FramebufferCache::createPrimaryFramebuffer() {
52 _primaryFramebufferDepthColor = gpu::FramebufferPointer(gpu::Framebuffer::create());52 _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
53 _deferredFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());53 _deferredFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
54 _deferredFramebufferDepthColor = gpu::FramebufferPointer(gpu::Framebuffer::create());54 _deferredFramebufferDepthColor = gpu::FramebufferPointer(gpu::Framebuffer::create());
55 55
@@ -60,7 +60,7 @@ void FramebufferCache::createPrimaryFramebuffer() { · 4 unmodified lines
60 auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);60 auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
61 _primaryColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));61 _primaryColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
62 62
63 _primaryFramebufferDepthColor->setRenderBuffer(0, _primaryColorTexture);63 _primaryFramebuffer->setRenderBuffer(0, _primaryColorTexture);
64 64
65 _deferredColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));65 _deferredColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
66 _deferredNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));66 _deferredNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
@@ -76,7 +76,7 @@ void FramebufferCache::createPrimaryFramebuffer() { · 9 unmodified lines
76 auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL); // Depth24_Stencil8 texel format76 auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL); // Depth24_Stencil8 texel format
77 _primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler));77 _primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler));
78 78
79 _primaryFramebufferDepthColor->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);79 _primaryFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
80 80
81 _deferredFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);81 _deferredFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
82 82
@@ -95,11 +95,11 @@ void FramebufferCache::createPrimaryFramebuffer() { · 12 unmodified lines
95 _lightingFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);95 _lightingFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
96}96}
97 97
98gpu::FramebufferPointer FramebufferCache::getPrimaryFramebufferDepthColor() {98gpu::FramebufferPointer FramebufferCache::getPrimaryFramebuffer() {
99 if (!_primaryFramebufferDepthColor) {99 if (!_primaryFramebuffer) {
100 createPrimaryFramebuffer();100 createPrimaryFramebuffer();
101 }101 }
102 return _primaryFramebufferDepthColor;102 return _primaryFramebuffer;
103}103}
104 104
105gpu::TexturePointer FramebufferCache::getPrimaryDepthTexture() {105gpu::TexturePointer FramebufferCache::getPrimaryDepthTexture() {