-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add scene renderer class #427
Open
anishmgoyal
wants to merge
1
commit into
google:main
Choose a base branch
from
anishmgoyal:addSceneRenderer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Copyright 2023 Google LLC | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#ifndef ppx_scene_forward_renderer_h | ||
#define ppx_scene_forward_renderer_h | ||
|
||
#include "ppx/scene/scene_config.h" | ||
#include "ppx/scene/scene_renderer.h" | ||
|
||
namespace ppx { | ||
namespace scene { | ||
|
||
class ForwardRenderer | ||
: public scene::Renderer | ||
{ | ||
private: | ||
ForwardRenderer(grfx::Device* pDevice, uint32_t numInFlightFrames); | ||
|
||
public: | ||
virtual ~ForwardRenderer(); | ||
|
||
static ppx::Result Create(grfx::Device* pDevice, uint32_t numFramesInFlight, scene::Renderer** ppRenderer); | ||
|
||
private: | ||
ppx::Result CreateObjects(); | ||
void DestroyObjects(); | ||
|
||
ppx::Result RenderInternal(scene::RenderOutput* pOutput, grfx::Semaphore* pRenderCompleteSemaphore) override; | ||
|
||
private: | ||
struct Frame; | ||
|
||
ppx::Result RenderToOutput( | ||
ForwardRenderer::Frame& frame, | ||
scene::RenderOutput* pOutput, | ||
grfx::Semaphore* pRenderCompleteSemaphore); | ||
|
||
private: | ||
struct Frame | ||
{ | ||
scene::RenderPass depthPrePass; | ||
scene::RenderPass shadowPass; | ||
scene::RenderPass lightingPass; | ||
grfx::CommandBufferPtr renderOutputCmd; | ||
grfx::SemaphorePtr timelineSemaphore; | ||
uint64_t timelineValue = 0; | ||
}; | ||
|
||
std::vector<Frame> mFrames; | ||
}; | ||
|
||
} // namespace scene | ||
} // namespace ppx | ||
|
||
#endif // ppx_scene_forward_renderer_h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,229 @@ | ||
// Copyright 2023 Google LLC | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#ifndef ppx_scene_renderer_h | ||
#define ppx_scene_renderer_h | ||
|
||
#include "ppx/scene/scene_config.h" | ||
|
||
namespace ppx { | ||
namespace scene { | ||
|
||
struct GraphicsPipeline | ||
{ | ||
std::string idString = ""; | ||
grfx::DescriptorSetLayoutPtr descriptorSetLayout = nullptr; | ||
grfx::PipelineInterfacePtr pipelineInterface = nullptr; | ||
grfx::GraphicsPipelinePtr pipeline = nullptr; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
struct ComputePipeline | ||
{ | ||
std::string idString = ""; | ||
grfx::DescriptorSetLayoutPtr descriptorSetLayout = nullptr; | ||
grfx::PipelineInterfacePtr pipelineInterface = nullptr; | ||
grfx::GraphicsPipelinePtr pipeline = nullptr; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
struct RenderTargetAttachment | ||
{ | ||
grfx::ImagePtr image = nullptr; | ||
grfx::RenderTargetViewPtr renderTargetView = nullptr; | ||
grfx::SampledImageViewPtr sampledImageView = nullptr; | ||
grfx::RenderTargetClearValue clearValue = {}; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
struct DepthStencilAttachment | ||
{ | ||
grfx::ImagePtr image = nullptr; | ||
grfx::DepthStencilViewPtr dephtStencilView = nullptr; | ||
grfx::SampledImageViewPtr sampledImageView = nullptr; | ||
grfx::DepthStencilClearValue clearValue = {}; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
struct RenderPass | ||
{ | ||
std::string name = ""; | ||
std::vector<scene::RenderTargetAttachment> renderTargetAttachments = {}; | ||
scene::DepthStencilAttachment depthStencilAttachment = {}; | ||
grfx::RenderPassPtr renderPass = nullptr; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
struct ComputePass | ||
{ | ||
const scene::GraphicsPipeline* pPipeline = nullptr; | ||
std::vector<grfx::BufferPtr> inputBuffers = {}; | ||
std::vector<grfx::SampledImageView*> inputTextures = {}; | ||
std::vector<grfx::BufferPtr> outputBuffers = {}; | ||
std::vector<grfx::StorageImageView*> outputTextures = {}; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
class RenderOutput | ||
{ | ||
protected: | ||
RenderOutput( | ||
scene::Renderer* pRenderer); | ||
|
||
public: | ||
virtual ~RenderOutput(); | ||
|
||
scene::Renderer* GetRenderer() const { return mRenderer; } | ||
|
||
virtual ppx::Result GetRenderTargetImage( | ||
grfx::Image** ppImage, | ||
grfx::Semaphore* pImageReadySemaphore) = 0; | ||
|
||
virtual bool IsSwapchain() const { return false; } | ||
|
||
private: | ||
scene::Renderer* mRenderer = nullptr; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
class RenderOutputToImage | ||
: public scene::RenderOutput | ||
{ | ||
protected: | ||
RenderOutputToImage( | ||
scene::Renderer* pRenderer, | ||
grfx::Image* pInitialImage = nullptr); | ||
|
||
public: | ||
virtual ~RenderOutputToImage(); | ||
|
||
static ppx::Result Create( | ||
scene::Renderer* pRenderer, | ||
grfx::Image* pInitialImage, // Can be NULL | ||
scene::RenderOutputToImage** ppRendererOutput); | ||
|
||
static void Destroy(scene::RenderOutputToImage* pRendererOutput); | ||
|
||
virtual ppx::Result GetRenderTargetImage( | ||
grfx::Image** ppImage, | ||
grfx::Semaphore* pImageReadySemaphore) override; | ||
|
||
void SetImage(grfx::Image* pImage); | ||
|
||
private: | ||
grfx::Image* mImage = nullptr; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
class RenderOutputToSwapchain | ||
: public scene::RenderOutput | ||
{ | ||
protected: | ||
RenderOutputToSwapchain( | ||
scene::Renderer* pRenderer, | ||
grfx::Swapchain* pInitialSwapchain); | ||
|
||
public: | ||
virtual ~RenderOutputToSwapchain(); | ||
|
||
static ppx::Result Create( | ||
scene::Renderer* pRenderer, | ||
grfx::Swapchain* pInitialSwapchain, // Can be NULL | ||
scene::RenderOutputToSwapchain** ppRendererOutput); | ||
|
||
static void Destroy(scene::RenderOutputToSwapchain* pRendererOutput); | ||
|
||
virtual ppx::Result GetRenderTargetImage( | ||
grfx::Image** ppImage, | ||
grfx::Semaphore* pImageReadySemaphore) override; | ||
|
||
virtual bool IsSwapchain() const override { return true; } | ||
|
||
void SetSwapchain(grfx::Swapchain* pSwapchain); | ||
|
||
private: | ||
ppx::Result CreateObject(); | ||
void DestroyObject(); | ||
|
||
private: | ||
grfx::Swapchain* mSwapchain = nullptr; | ||
grfx::FencePtr mFence = nullptr; | ||
uint32_t mImageIndex = 0; | ||
}; | ||
|
||
// ------------------------------------------------------------------------------------------------- | ||
|
||
class Renderer | ||
{ | ||
protected: | ||
Renderer( | ||
grfx::Device* pDevice, | ||
uint32_t numInFlightFrames); | ||
|
||
public: | ||
virtual ~Renderer(); | ||
|
||
grfx::Device* GetDevice() const { return mDevice; } | ||
|
||
uint32_t GetNumInFlightFrames() const { return mNumInFlightFrames; } | ||
scene::Scene* GetScene() const { return mScene; } | ||
|
||
void SetScene(scene::Scene* pScene); | ||
|
||
ppx::Result Render( | ||
scene::RenderOutput* pOutput, | ||
grfx::Semaphore* pRenderCompleteSemaphore); | ||
|
||
protected: | ||
ppx::Result GetRenderOutputRenderPass( | ||
grfx::Image* pImage, | ||
grfx::RenderPass** ppRenderPass); | ||
|
||
private: | ||
virtual ppx::Result RenderInternal( | ||
scene::RenderOutput* pOutput, | ||
grfx::Semaphore* pRenderCompleteSemaphore) = 0; | ||
|
||
// Create render pass with 1 render target using pImage. | ||
// OVerride this method in derived renderers to customize output render passes. | ||
// | ||
virtual ppx::Result CreateOutputRenderPass( | ||
grfx::Image* pImage, | ||
grfx::RenderPass** ppRenderPass); | ||
|
||
protected: | ||
grfx::Device* mDevice = nullptr; | ||
uint32_t mNumInFlightFrames = 0; | ||
uint32_t mNumFramesRendered = 0; | ||
uint32_t mCurrentFrameIndex = 0; | ||
uint2 mRenderResolution = uint2(0, 0); | ||
std::vector<scene::GraphicsPipeline> mGraphicsPipelines = {}; | ||
std::vector<scene::GraphicsPipeline> mComputePipelines = {}; | ||
std::unordered_map<grfx::Image*, grfx::RenderPassPtr> mOutputRenderPasses = {}; | ||
bool mEnableDepthPrePass = false; | ||
scene::Scene* mScene = nullptr; | ||
}; | ||
|
||
} // namespace scene | ||
} // namespace ppx | ||
|
||
#endif // ppx_scene_renderer_h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we move this into it's own PR? These shaders are already checked in and this is needed to use them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in #470. This line can be removed from this PR.