MErging and still trying to understand the curvature isssue

samcake committed 10 years ago

Commit 3ec14fd1 parent 90e569716 files · +186 −65Browse files

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

Unified · Split

libraries/render-utils/src/FramebufferCache.cpp+1−1

@@ -107,7 +107,7 @@ void FramebufferCache::createPrimaryFramebuffer() { · 106 unmodified lines
107		107
108	// For AO:	108	// For AO:
109	auto pointMipSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_POINT);	109	auto pointMipSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_POINT);
110	_depthPyramidTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::RGB), width, height, pointMipSampler));	110	_depthPyramidTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::RGB), width, height, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR)));
111	_depthPyramidFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());	111	_depthPyramidFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
112	_depthPyramidFramebuffer->setRenderBuffer(0, _depthPyramidTexture);	112	_depthPyramidFramebuffer->setRenderBuffer(0, _depthPyramidTexture);
113	_depthPyramidFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);	113	_depthPyramidFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);