From 8ece05957f6a86d11dcf34f75e55504e2f3143c8 Mon Sep 17 00:00:00 2001
From: demiralp <demiralp@vr.rwth-aachen.de>
Date: Thu, 26 Jul 2018 17:38:31 +0200
Subject: [PATCH] Corrected non-HMD setup.
---
library/phx/rendering/render_passes/blit_pass.hpp | 2 +-
library/phx/setup.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/library/phx/rendering/render_passes/blit_pass.hpp b/library/phx/rendering/render_passes/blit_pass.hpp
index 324a1187..262f82aa 100644
--- a/library/phx/rendering/render_passes/blit_pass.hpp
+++ b/library/phx/rendering/render_passes/blit_pass.hpp
@@ -36,7 +36,7 @@ namespace phx {
// A null target will blit onto the default framebuffer.
class PHOENIX_EXPORT BlitPass : public RenderPass {
public:
- explicit BlitPass(gl::framebuffer* source, gl::framebuffer* target = nullptr);
+ explicit BlitPass(gl::framebuffer* source, gl::framebuffer* target);
explicit BlitPass(gl::framebuffer* source, Window* target);
BlitPass(const BlitPass&) = default;
BlitPass(BlitPass&&) = default;
diff --git a/library/phx/setup.cpp b/library/phx/setup.cpp
index bdd5c1a8..76fb0b7f 100644
--- a/library/phx/setup.cpp
+++ b/library/phx/setup.cpp
@@ -129,7 +129,8 @@ void Setup::SetupDefaultFrameGraphWindow(RenderingSystem* rendering_system,
frame_graph->AddRenderPass(std::make_unique<ClearPass>(render_target));
frame_graph->AddRenderPass(std::make_unique<SkyboxPass>(render_target));
frame_graph->AddRenderPass(std::make_unique<GeometryPass>(render_target));
- frame_graph->AddRenderPass(std::make_unique<BlitPass>(render_target));
+ frame_graph->AddRenderPass(std::make_unique<BlitPass>(
+ render_target, engine->GetSystem<DisplaySystemWindow>()->GetWindow()));
frame_graph->Initialize();
--
GitLab