Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sources: Run clang-format on everything.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2016-09-18 09:38:01 +09:00
parent fe948af095
commit dc8479928c
386 changed files with 19560 additions and 18080 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/video_core/primitive_assembly.cpp
View file

@ -10,62 +10,61 @@
namespace Pica {
template<typename VertexType>
template <typename VertexType>
PrimitiveAssembler<VertexType>::PrimitiveAssembler(Regs::TriangleTopology topology)
: topology(topology), buffer_index(0) {
}
template<typename VertexType>
void PrimitiveAssembler<VertexType>::SubmitVertex(VertexType& vtx, TriangleHandler triangle_handler)
{
template <typename VertexType>
void PrimitiveAssembler<VertexType>::SubmitVertex(VertexType& vtx,
TriangleHandler triangle_handler) {
switch (topology) {
// TODO: Figure out what's different with TriangleTopology::Shader.
case Regs::TriangleTopology::List:
case Regs::TriangleTopology::Shader:
if (buffer_index < 2) {
buffer[buffer_index++] = vtx;
} else {
buffer_index = 0;
// TODO: Figure out what's different with TriangleTopology::Shader.
case Regs::TriangleTopology::List:
case Regs::TriangleTopology::Shader:
if (buffer_index < 2) {
buffer[buffer_index++] = vtx;
} else {
buffer_index = 0;
triangle_handler(buffer[0], buffer[1], vtx);
}
break;
triangle_handler(buffer[0], buffer[1], vtx);
}
break;
case Regs::TriangleTopology::Strip:
case Regs::TriangleTopology::Fan:
if (strip_ready)
triangle_handler(buffer[0], buffer[1], vtx);
case Regs::TriangleTopology::Strip:
case Regs::TriangleTopology::Fan:
if (strip_ready)
triangle_handler(buffer[0], buffer[1], vtx);
buffer[buffer_index] = vtx;
buffer[buffer_index] = vtx;
strip_ready |= (buffer_index == 1);
strip_ready |= (buffer_index == 1);
if (topology == Regs::TriangleTopology::Strip)
buffer_index = !buffer_index;
else if (topology == Regs::TriangleTopology::Fan)
buffer_index = 1;
break;
if (topology == Regs::TriangleTopology::Strip)
buffer_index = !buffer_index;
else if (topology == Regs::TriangleTopology::Fan)
buffer_index = 1;
break;
default:
LOG_ERROR(HW_GPU, "Unknown triangle topology %x:", (int)topology);
break;
default:
LOG_ERROR(HW_GPU, "Unknown triangle topology %x:", (int)topology);
break;
}
}
template<typename VertexType>
template <typename VertexType>
void PrimitiveAssembler<VertexType>::Reset() {
buffer_index = 0;
strip_ready = false;
}
template<typename VertexType>
template <typename VertexType>
void PrimitiveAssembler<VertexType>::Reconfigure(Regs::TriangleTopology topology) {
Reset();
this->topology = topology;
}
// explicitly instantiate use cases
template
struct PrimitiveAssembler<Shader::OutputVertex>;
template struct PrimitiveAssembler<Shader::OutputVertex>;
} // namespace