Skip to content

Commit

Permalink
fix naming
Browse files Browse the repository at this point in the history
  • Loading branch information
star-e committed Aug 10, 2023
1 parent 22eca7f commit 60a89e2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions native/cocos/renderer/pipeline/custom/FGDispatcherTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct FGRenderPassInfo {
FGRenderPassInfo& operator=(FGRenderPassInfo&& rhs) = default;
FGRenderPassInfo& operator=(FGRenderPassInfo const& rhs) = default;

std::vector<LayoutAccess> colorAccesses;
ccstd::vector<LayoutAccess> colorAccesses;
LayoutAccess dsAccess;
LayoutAccess dsResolveAccess;
gfx::RenderPassInfo rpInfo;
Expand All @@ -144,23 +144,23 @@ struct Barrier {
};

struct BarrierNode {
std::vector<Barrier> frontBarriers;
std::vector<Barrier> rearBarriers;
ccstd::vector<Barrier> frontBarriers;
ccstd::vector<Barrier> rearBarriers;
};

struct SliceNode {
bool full{false};
std::vector<uint32_t> mips;
ccstd::vector<uint32_t> mips;
};

struct TextureNode {
bool full{false};
std::vector<SliceNode> slices;
ccstd::vector<SliceNode> slices;
};

struct ResourceNode {
bool full{false};
std::vector<TextureNode> planes;
ccstd::vector<TextureNode> planes;
};

struct ResourceAccessGraph {
Expand Down
10 changes: 5 additions & 5 deletions native/cocos/renderer/pipeline/custom/FrameGraphDispatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,11 @@ LayoutAccess FrameGraphDispatcher::getResourceAccess(ResourceGraph::vertex_descr
using PmrString = ccstd::pmr::string;
using EdgeList = std::pair<RelationGraph::edge_descriptor, RelationGraph::edge_descriptor>;
using CloseCircuit = std::pair<EdgeList, EdgeList>;
using CloseCircuits = std::vector<CloseCircuit>;
using CloseCircuits = ccstd::vector<CloseCircuit>;
using RelationVert = RelationGraph::vertex_descriptor;
using RelationVerts = std::vector<RelationVert>;
using RelationVerts = ccstd::vector<RelationVert>;
using RelationEdge = RelationGraph::edge_descriptor;
using RelationEdges = std::vector<RelationEdge>;
using RelationEdges = ccstd::vector<RelationEdge>;
using ScoreMap = std::map<RelationVert, std::pair<int64_t /*backward*/, int64_t /*forward*/>>;
using RasterViewsMap = PmrTransparentMap<ccstd::pmr::string, RasterView>;
using ComputeViewsMap = PmrTransparentMap<ccstd::pmr::string, ccstd::pmr::vector<ComputeView>>;
Expand Down Expand Up @@ -2418,7 +2418,7 @@ void passReorder(FrameGraphDispatcher &fgDispatcher) {
boost::transitive_closure(relationGraph, relationGraphTc);

CloseCircuits circuits;
std::vector<ResourceAccessGraph::edge_descriptor> crossEdges;
ccstd::vector<ResourceAccessGraph::edge_descriptor> crossEdges;
PassVisitor visitor(relationGraphTc, circuits);
auto colors = relationGraph.colors(scratch);
boost::depth_first_search(relationGraph, visitor, get(colors, relationGraph));
Expand Down Expand Up @@ -2446,7 +2446,7 @@ void passReorder(FrameGraphDispatcher &fgDispatcher) {
RelationVerts candidates;
candidates.push_back(EXPECT_START_ID);

std::vector<RelationVert> candidateBuffer;
ccstd::vector<RelationVert> candidateBuffer;
uint32_t coloredVerts = 0;
while (coloredVerts < relationGraph._vertices.size()) {
// decreasing order, pop back from vector, push into queue, then it's ascending order.
Expand Down

0 comments on commit 60a89e2

Please sign in to comment.