RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed sync between processors

Browse Source
This commit is contained in:
h4570
2020-12-27 19:09:50 +01:00
parent c7fe915174
commit 1d7730504b
4 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/modules/renderer.cpp
+5
View File
@@ -287,7 +287,12 @@ void Renderer::draw(Mesh **t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bul
draw(*meshesInFrustum[0], t_bulbs, t_bulbsCount);
draw(*meshesInFrustum[1], t_bulbs, t_bulbsCount);
vifSender->enableWait();
resetWaitFlag();
vifSender->drawTheSameWithOtherMatrices(renderData, meshesInFrustum, 2, addedMeshes);
if (isWaitFlagSet())
resetWaitFlag();
else
waitForRender();
delete[] meshesInFrustum;
}
else
src/engine/modules/vif_sender.cpp
+43 -29
View File
@@ -157,7 +157,10 @@ void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_ver
void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mesh **t_meshes, const u32 &t_skip, const u32 &t_count)
{
packet2_t *packet1 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true);
packet2_t *packet2 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true);
packet2_t *currMPacket = packet1;
u8 currPacketIndex = 1;
u8 switchCounter = 0;
u32 i;
for (i = t_skip; i < t_count; i++)
@@ -171,57 +174,68 @@ void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mes
modelViewProj = *t_renderData.view * modelViewProj;
modelViewProj = *t_renderData.projection * modelViewProj;
packet2_utils_vu_open_unpack(packet2, 0, true);
packet2_utils_vu_open_unpack(currMPacket, 0, true);
{
packet2_add_data(packet2, modelViewProj.data, 4);
packet2_add_data(currMPacket, modelViewProj.data, 4);
}
packet2_utils_vu_close_unpack(packet2);
packet2_utils_vu_open_unpack(packet2, VU1_RGBA_ADDRESS, true);
packet2_utils_vu_close_unpack(currMPacket);
packet2_utils_vu_open_unpack(currMPacket, VU1_RGBA_ADDRESS, true);
{
packet2_add_u32(packet2, t_meshes[i]->color.r);
packet2_add_u32(packet2, t_meshes[i]->color.g);
packet2_add_u32(packet2, t_meshes[i]->color.b);
packet2_add_u32(packet2, t_meshes[i]->color.a);
packet2_add_u32(currMPacket, t_meshes[i]->color.r);
packet2_add_u32(currMPacket, t_meshes[i]->color.g);
packet2_add_u32(currMPacket, t_meshes[i]->color.b);
packet2_add_u32(currMPacket, t_meshes[i]->color.a);
}
packet2_utils_vu_close_unpack(packet2);
packet2_utils_vu_close_unpack(currMPacket);
if (i != t_count - 1)
packet2_utils_vu_add_start_program(packet2, 0);
packet2_utils_vu_add_start_program(currMPacket, 0);
if (switchCounter++ >= 32)
{
switchCounter = 0;
if (i == t_count - 1) // is last
{
packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true);
packet2_utils_vu_open_unpack(currMPacket, VU1_PARAMS_ADDRESS, true);
{
packet2_add_u32(packet2, true); // Draw wait finish?
packet2_add_u32(packet2, lastVertCount); // Vertex count
packet2_add_u32(packet2, lastVertCount / 3); // Triangles count
packet2_add_u32(packet2, 0); // Free
packet2_add_u32(currMPacket, true); // Draw wait finish?
packet2_add_u32(currMPacket, lastVertCount); // Vertex count
packet2_add_u32(currMPacket, lastVertCount / 3); // Triangles count
packet2_add_u32(currMPacket, 0); // Free
}
packet2_utils_vu_close_unpack(packet2);
packet2_utils_vu_add_start_program(packet2, 0);
packet2_utils_vu_close_unpack(currMPacket);
packet2_utils_vu_add_start_program(currMPacket, 0);
}
packet2_utils_vu_add_end_tag(packet2);
packet2_utils_vu_add_end_tag(currMPacket);
dma_channel_wait(DMA_CHANNEL_VIF1, 0);
dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1);
packet2_reset(packet2, false);
dma_channel_send_packet2(currMPacket, DMA_CHANNEL_VIF1, 1);
if (currPacketIndex == 1)
{
currPacketIndex = 2;
currMPacket = packet2;
}
else
{
currPacketIndex = 1;
currMPacket = packet1;
}
packet2_reset(currMPacket, false);
}
}
if (switchCounter != 0)
{
packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true);
packet2_utils_vu_open_unpack(currMPacket, VU1_PARAMS_ADDRESS, true);
{
packet2_add_u32(packet2, true); // Draw wait finish?
packet2_add_u32(packet2, lastVertCount); // Vertex count
packet2_add_u32(packet2, lastVertCount / 3); // Triangles count
packet2_add_u32(packet2, 0); // Free
packet2_add_u32(currMPacket, true); // Draw wait finish?
packet2_add_u32(currMPacket, lastVertCount); // Vertex count
packet2_add_u32(currMPacket, lastVertCount / 3); // Triangles count
packet2_add_u32(currMPacket, 0); // Free
}
packet2_utils_vu_close_unpack(packet2);
packet2_utils_vu_add_start_program(packet2, 0);
packet2_utils_vu_add_end_tag(packet2);
packet2_utils_vu_close_unpack(currMPacket);
packet2_utils_vu_add_start_program(currMPacket, 0);
packet2_utils_vu_add_end_tag(currMPacket);
dma_channel_wait(DMA_CHANNEL_VIF1, 0);
dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1);
dma_channel_send_packet2(currMPacket, DMA_CHANNEL_VIF1, 1);
}
packet2_free(packet1);
packet2_free(packet2);
}