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

changed order of wait/send

Browse Source
This commit is contained in:
h4570
2020-11-22 13:15:15 +01:00
parent 756f69d160
commit e9febb5d8d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/modules/gif_sender.cpp
+2 -1
View File
@@ -68,6 +68,7 @@ void GifSender::sendTexture(MeshTexture &texture, texbuffer_t *t_texBuffer)
packet2_update(packet2, draw_texture_wrapping(packet2->next, 0, texture.getWrapSettings())); packet2_update(packet2, draw_texture_wrapping(packet2->next, 0, texture.getWrapSettings()));
packet2_chain_close_tag(packet2); packet2_chain_close_tag(packet2);
packet2_update(packet2, draw_texture_flush(packet2->next)); packet2_update(packet2, draw_texture_flush(packet2->next));
dma_channel_wait(DMA_CHANNEL_GIF, 0);
dma_channel_send_packet2(packet2, DMA_CHANNEL_GIF, true); dma_channel_send_packet2(packet2, DMA_CHANNEL_GIF, true);
dma_channel_wait(DMA_CHANNEL_GIF, 0); dma_channel_wait(DMA_CHANNEL_GIF, 0);
packet2_free(packet2); packet2_free(packet2);
@@ -109,8 +110,8 @@ void GifSender::sendPacket()
packet2_update(currentPacket, draw_finish(currentPacket->next)); packet2_update(currentPacket, draw_finish(currentPacket->next));
packet2_chain_close_tag(currentPacket); packet2_chain_close_tag(currentPacket);
} }
dma_channel_send_packet2(currentPacket, DMA_CHANNEL_GIF, true);
dma_channel_wait(DMA_CHANNEL_GIF, 0); dma_channel_wait(DMA_CHANNEL_GIF, 0);
dma_channel_send_packet2(currentPacket, DMA_CHANNEL_GIF, true);
} }
/** Adds clear screen to current packet */ /** Adds clear screen to current packet */
src/engine/modules/vif_sender.cpp
+2 -2
View File
@@ -63,8 +63,8 @@ void VifSender::uploadMicroProgram()
1); 1);
packet2_vu_add_micro_program(packet2, 0, &VU1Draw3D_CodeStart, &VU1Draw3D_CodeEnd); packet2_vu_add_micro_program(packet2, 0, &VU1Draw3D_CodeStart, &VU1Draw3D_CodeEnd);
packet2_vu_add_end_tag(packet2); packet2_vu_add_end_tag(packet2);
dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1);
dma_channel_wait(DMA_CHANNEL_VIF1, 0); dma_channel_wait(DMA_CHANNEL_VIF1, 0);
dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1);
packet2_free(packet2); packet2_free(packet2);
} }
@@ -77,8 +77,8 @@ void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_po
packet2_reset(matricesPacket, false); packet2_reset(matricesPacket, false);
packet2_vu_add_unpack_data(matricesPacket, 0, &localScreen, 8, 0); packet2_vu_add_unpack_data(matricesPacket, 0, &localScreen, 8, 0);
packet2_vu_add_end_tag(matricesPacket); packet2_vu_add_end_tag(matricesPacket);
dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1);
dma_channel_wait(DMA_CHANNEL_VIF1, 0); dma_channel_wait(DMA_CHANNEL_VIF1, 0);
dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1);
} }
void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 vertCount2, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer) void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 vertCount2, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer)