Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 06:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix on android, merge android and windows forward pipelines

Browse source
This commit is contained in:
Anna 2019-07-29 14:59:15 -07:00
parent 2fca77867b
commit 3a437cf190
4 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/render-utils/src/RenderCommonTask.cpp
View file

@ -154,19 +154,13 @@ void NewFramebuffer::run(const render::RenderContextPointer& renderContext, cons
glm::uvec2 frameSize(args->_viewport.z, args->_viewport.w); glm::uvec2 frameSize(args->_viewport.z, args->_viewport.w);
output.reset(); output.reset();
auto destBlitFbo = args->_blitFramebuffer;
if (destBlitFbo && destBlitFbo->getSize() == frameSize) {
output = destBlitFbo;
return;
}
// Else use the lodal Framebuffer // Else use the lodal Framebuffer
if (_outputFramebuffer && _outputFramebuffer->getSize() != frameSize) { if (_outputFramebuffer && _outputFramebuffer->getSize() != frameSize) {
_outputFramebuffer.reset(); _outputFramebuffer.reset();
} }
if (!_outputFramebuffer) { if (!_outputFramebuffer) {
_outputFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("newFramebuffer2.out")); _outputFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("newFramebuffer.out"));
auto colorFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10); auto colorFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10);
auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR); auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR);
auto colorTexture = gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler); auto colorTexture = gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler);
@ -195,7 +189,7 @@ void NewOrDefaultFramebuffer::run(const render::RenderContextPointer& renderCont
} }
if (!_outputFramebuffer) { if (!_outputFramebuffer) {
_outputFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("newFramebuffer.out")); _outputFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("newOrDefaultFramebuffer.out"));
auto colorFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10); auto colorFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10);
auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR); auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR);
auto colorTexture = gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler); auto colorTexture = gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler);

13
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -140,22 +140,15 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs); task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs);
} }
//const auto newResolvedFramebuffer = task.addJob<NewFramebuffer>("MakeResolvingFramebuffer"); const auto newResolvedFramebuffer = task.addJob<NewFramebuffer>("MakeResolvingFramebuffer");
#if 1
const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
#else
const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying(); const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying();
#endif
const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs); const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
const auto toneMappedBuffer = resolvedFramebuffer;
//const auto toneMappingInputs = ToneMappingDeferred::Input(resolvedFramebuffer, args->blitFramebuffer).asVarying(); const auto toneMappedBuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", resolvedFramebuffer);
const auto primaryFramebuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", toneMappedBuffer);
// HUD Layer // HUD Layer
const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(primaryFramebuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying(); const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(toneMappedBuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying();
task.addJob<RenderHUDLayerTask>("RenderHUDLayer", renderHUDLayerInputs); task.addJob<RenderHUDLayerTask>("RenderHUDLayer", renderHUDLayerInputs);
} }

15
libraries/render-utils/src/ToneMapAndResampleTask.cpp
View file

@ -29,7 +29,7 @@ ToneMapAndResample::ToneMapAndResample() {
Parameters parameters; Parameters parameters;
_parametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Parameters), (const gpu::Byte*) &parameters)); _parametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Parameters), (const gpu::Byte*) &parameters));
} }
/*
void ToneMapAndResample::init() { void ToneMapAndResample::init() {
// shared_ptr to gpu::State // shared_ptr to gpu::State
gpu::StatePointer blitState = gpu::StatePointer(new gpu::State()); gpu::StatePointer blitState = gpu::StatePointer(new gpu::State());
@ -40,7 +40,6 @@ void ToneMapAndResample::init() {
_pipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping), blitState)); _pipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping), blitState));
_mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping_mirrored), blitState)); _mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping_mirrored), blitState));
} }
*/
void ToneMapAndResample::setExposure(float exposure) { void ToneMapAndResample::setExposure(float exposure) {
auto& params = _parametersBuffer.get<Parameters>(); auto& params = _parametersBuffer.get<Parameters>();
@ -72,21 +71,15 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
auto lightingBuffer = input->getRenderBuffer(0); auto lightingBuffer = input->getRenderBuffer(0);
resampledFrameBuffer = args->_blitFramebuffer; resampledFrameBuffer = args->_blitFramebuffer;
/*
if (!lightingBuffer || !resampledFrameBuffer) { if (!lightingBuffer || !resampledFrameBuffer) {
return; return;
}*/ }
if (resampledFrameBuffer != sourceFramebuffer) { if (resampledFrameBuffer != sourceFramebuffer) {
if (!_pipeline) { if (!_pipeline) {
gpu::StatePointer blitState = gpu::StatePointer(new gpu::State()); init();
blitState->setDepthTest(gpu::State::DepthTest(false, false));
blitState->setColorWriteMask(true, true, true, true);
_pipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping), blitState));
_mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(gpu::Shader::createProgram(toneMapping_mirrored), blitState));
} }
const auto bufferSize = resampledFrameBuffer->getSize(); const auto bufferSize = resampledFrameBuffer->getSize();

2
libraries/render-utils/src/ToneMapAndResampleTask.h
View file

@ -96,7 +96,7 @@ private:
typedef gpu::BufferView UniformBufferView; typedef gpu::BufferView UniformBufferView;
gpu::BufferView _parametersBuffer; gpu::BufferView _parametersBuffer;
void init(RenderArgs* args); void init();
}; };
#endif // hifi_ToneMapAndResample_h #endif // hifi_ToneMapAndResample_h