Skip to content

Fixed wrong handling of scissor and viewport in render quad/mesh. #103

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.

Sign up for GitHub

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

Merged
DragonJoker merged 1 commit into from
May 5, 2023
Merged

Fixed wrong handling of scissor and viewport in render quad/mesh. #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/RenderGraph/RunnablePasses/RenderMeshHolder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ namespace crg
, VkPipelineColorBlendStateCreateInfo blendState );
void doCreatePipeline( uint32_t index );
VkPipelineViewportStateCreateInfo doCreateViewportState( VkExtent2D const & renderSize
, VkViewportArray & viewports
, VkScissorArray & scissors );
, VkViewport & viewport
, VkRect2D & scissor );

private:
rm::ConfigData m_config;
GraphContext & m_context;
PipelineHolder m_pipeline;
VkRenderPass m_renderPass{};
VkExtent2D m_renderSize{};
VkViewportArray m_viewports{};
VkScissorArray m_scissors{};
VkViewport m_viewport{};
VkRect2D m_scissor{};
VkPipelineViewportStateCreateInfo m_vpState{};
VkPipelineInputAssemblyStateCreateInfo m_iaState{};
VkPipelineMultisampleStateCreateInfo m_msState{};
Expand Down
8 changes: 4 additions & 4 deletions include/RenderGraph/RunnablePasses/RenderQuadHolder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ namespace crg
, VkPipelineColorBlendStateCreateInfo blendState );
void doCreatePipeline( uint32_t passIndex );
VkPipelineViewportStateCreateInfo doCreateViewportState( VkExtent2D const & renderSize
, VkViewportArray & viewports
, VkScissorArray & scissors );
, VkViewport & viewport
, VkRect2D & scissor );

private:
rq::ConfigData m_config;
Expand All @@ -71,8 +71,8 @@ namespace crg
VertexBuffer const * m_vertexBuffer{};
VkRenderPass m_renderPass{};
VkExtent2D m_renderSize{};
VkViewportArray m_viewports{};
VkScissorArray m_scissors{};
VkViewport m_viewport{};
VkRect2D m_scissor{};
VkPipelineViewportStateCreateInfo m_vpState{};
VkPipelineInputAssemblyStateCreateInfo m_iaState{};
VkPipelineMultisampleStateCreateInfo m_msState{};
Expand Down
22 changes: 11 additions & 11 deletions source/RenderGraph/RunnablePasses/RenderMeshHolder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ namespace crg
, VkRenderPass renderPass
, VkPipelineColorBlendStateCreateInfo blendState )
{
m_vpState = doCreateViewportState( renderSize, m_viewports, m_scissors );
m_vpState = doCreateViewportState( renderSize, m_viewport, m_scissor );
m_renderSize = renderSize;
m_renderPass = renderPass;
m_blendAttachs = { blendState.pAttachments, blendState.pAttachments + blendState.attachmentCount };
Expand Down Expand Up @@ -191,23 +191,23 @@ namespace crg
}

VkPipelineViewportStateCreateInfo RenderMeshHolder::doCreateViewportState( VkExtent2D const & renderSize
, VkViewportArray & viewports
, VkScissorArray & scissors )
, VkViewport & viewport
, VkRect2D & scissor )
{
viewports.push_back( { float( m_config.renderPosition.x )
viewport = { float( m_config.renderPosition.x )
, float( m_config.renderPosition.y )
, float( renderSize.width )
, float( renderSize.height )
, 0.0f
, 1.0f } );
scissors.push_back( { { m_config.renderPosition.x, m_config.renderPosition.y }
, { renderSize.width, renderSize.height } } );
, 1.0f };
scissor = { { m_config.renderPosition.x, m_config.renderPosition.y }
, { renderSize.width, renderSize.height } };
return { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO
, nullptr
, 0u
, uint32_t( viewports.size() )
, viewports.data()
, uint32_t( scissors.size() )
, scissors.data() };
, 1u
, & viewport
, 1u
, & scissor };
}
}
22 changes: 11 additions & 11 deletions source/RenderGraph/RunnablePasses/RenderQuadHolder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ namespace crg
, VkRenderPass renderPass
, VkPipelineColorBlendStateCreateInfo blendState )
{
m_vpState = doCreateViewportState( renderSize, m_viewports, m_scissors );
m_vpState = doCreateViewportState( renderSize, m_viewport, m_scissor );
m_renderSize = renderSize;
m_renderPass = renderPass;
m_blendAttachs = { blendState.pAttachments, blendState.pAttachments + blendState.attachmentCount };
Expand Down Expand Up @@ -179,23 +179,23 @@ namespace crg
}

VkPipelineViewportStateCreateInfo RenderQuadHolder::doCreateViewportState( VkExtent2D const & renderSize
, VkViewportArray & viewports
, VkScissorArray & scissors )
, VkViewport & viewport
, VkRect2D & scissor )
{
viewports.push_back( { float( m_config.renderPosition.x )
viewport = { float( m_config.renderPosition.x )
, float( m_config.renderPosition.y )
, float( renderSize.width )
, float( renderSize.height )
, 0.0f
, 1.0f } );
scissors.push_back( { { m_config.renderPosition.x, m_config.renderPosition.y }
, { renderSize.width, renderSize.height } } );
, 1.0f };
scissor = { { m_config.renderPosition.x, m_config.renderPosition.y }
, { renderSize.width, renderSize.height } };
return { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO
, nullptr
, 0u
, uint32_t( viewports.size() )
, viewports.data()
, uint32_t( scissors.size() )
, scissors.data() };
, 1u
, &viewport
, 1u
, &scissor };
}
}