History

Additional plugin debugging, better plugin resource cleanup

Brad Davis committed 10 years ago

Commit 28771cb1 parent 5615f8829 files · +135 −54Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+1−3
@@ -346,12 +346,11 @@ void PreparePrimaryFramebuffer::run(const SceneContextPointer& sceneContext, con · 345 unmodified lines
346 }346 }
347 347
348 if (!_primaryFramebuffer) {348 if (!_primaryFramebuffer) {
349 _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());349 _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("deferredPrimary"));
350 auto colorFormat = gpu::Element::COLOR_SRGBA_32;350 auto colorFormat = gpu::Element::COLOR_SRGBA_32;
351 351
352 auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);352 auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
353 auto primaryColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, frameSize.x, frameSize.y, defaultSampler));353 auto primaryColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, frameSize.x, frameSize.y, defaultSampler));
354 primaryColorTexture->setSource("PreparePrimaryFramebuffer::primaryColorTexture");
355 354
356 355
357 _primaryFramebuffer->setRenderBuffer(0, primaryColorTexture);356 _primaryFramebuffer->setRenderBuffer(0, primaryColorTexture);
@@ -359,7 +358,6 @@ void PreparePrimaryFramebuffer::run(const SceneContextPointer& sceneContext, con · 1 unmodified line
359 358
360 auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL); // Depth24_Stencil8 texel format359 auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL); // Depth24_Stencil8 texel format
361 auto primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, frameSize.x, frameSize.y, defaultSampler));360 auto primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, frameSize.x, frameSize.y, defaultSampler));
362 primaryDepthTexture->setSource("PreparePrimaryFramebuffer::primaryDepthTexture");
363 361
364 _primaryFramebuffer->setDepthStencilBuffer(primaryDepthTexture, depthFormat);362 _primaryFramebuffer->setDepthStencilBuffer(primaryDepthTexture, depthFormat);
365 }363 }

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