Skip to content

Commit

Permalink
Ran clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
robertosfield committed Sep 28, 2023
1 parent 8aee613 commit 2e457a0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 0 additions & 2 deletions include/vsg/state/ViewDependentState.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,4 @@ namespace vsg
};
VSG_type_name(vsg::ViewDependentState);



} // namespace vsg
7 changes: 3 additions & 4 deletions src/vsg/state/ViewDependentState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
</editor-fold> */

#include <vsg/app/View.h>
#include <vsg/commands/PipelineBarrier.h>
#include <vsg/core/compare.h>
#include <vsg/io/Logger.h>
#include <vsg/io/Options.h>
#include <vsg/io/write.h>
#include <vsg/state/DescriptorImage.h>
#include <vsg/state/ViewDependentState.h>
#include <vsg/commands/PipelineBarrier.h>
#include <vsg/vk/Context.h>

using namespace vsg;
Expand Down Expand Up @@ -270,7 +270,7 @@ void ViewDependentState::init(ResourceRequirements& requirements)
DescriptorSetLayoutBindings descriptorBindings{
VkDescriptorSetLayoutBinding{0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, // lightData
VkDescriptorSetLayoutBinding{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, // viewportData
VkDescriptorSetLayoutBinding{2, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, // shadow map 2D texture array
VkDescriptorSetLayoutBinding{2, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, // shadow map 2D texture array
};

descriptorSetLayout = DescriptorSetLayout::create(descriptorBindings);
Expand Down Expand Up @@ -416,8 +416,7 @@ void ViewDependentState::compile(Context& context)
VK_QUEUE_FAMILY_IGNORED,
VK_QUEUE_FAMILY_IGNORED,
shadowDepthImage,
VkImageSubresourceRange{VK_IMAGE_ASPECT_DEPTH_BIT, 0, 1, 0, static_cast<uint32_t>(shadowMaps.size())}
);
VkImageSubresourceRange{VK_IMAGE_ASPECT_DEPTH_BIT, 0, 1, 0, static_cast<uint32_t>(shadowMaps.size())});

auto pipelinBarrier = PipelineBarrier::create(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, initLayoutBarrier);

Expand Down
6 changes: 3 additions & 3 deletions src/vsg/utils/Builder.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

#include <vsg/io/Logger.h>
#include <vsg/io/read.h>
#include <vsg/nodes/StateGroup.h>
#include <vsg/nodes/CullNode.h>
#include <vsg/nodes/StateGroup.h>
#include <vsg/nodes/VertexIndexDraw.h>
#include <vsg/state/ColorBlendState.h>
#include <vsg/state/DepthStencilState.h>
Expand Down Expand Up @@ -205,7 +205,7 @@ vec3 Builder::y_texcoord(const StateInfo& info) const

ref_ptr<Node> Builder::decorateWithCullNodeIfRequired(const GeometryInfo& info, ref_ptr<Node> node) const
{
if (info.cullNode)
if (info.cullNode)
{
auto cullNode = vsg::CullNode::create();
cullNode->child = node;
Expand All @@ -215,7 +215,7 @@ ref_ptr<Node> Builder::decorateWithCullNodeIfRequired(const GeometryInfo& info,
if (auto v3a = info.positions.cast<vec3Array>())
{
box bound;
for(auto& v : *v3a)
for (auto& v : *v3a)
{
bound.add(v);
}
Expand Down

0 comments on commit 2e457a0

Please sign in to comment.