mirror of
https://gitlab.com/skmp/dca3-game.git
synced 2025-08-31 02:20:04 +02:00
Merge branch 'skmp/refsw-and-kos-fixes' into 'main'
refsw and kos fixes See merge request skmp/dca3-game!100
This commit is contained in:
4
vendor/emu/refsw/refsw_tile.cpp
vendored
4
vendor/emu/refsw/refsw_tile.cpp
vendored
@@ -188,6 +188,10 @@ void RenderParamTags(int tileX, int tileY) {
|
||||
tagStatus[index].rendered = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (rm == RM_TRANSLUCENT_PRESORT) {
|
||||
tagStatus[index].valid = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
3
vendor/koshle/hlekos.cpp
vendored
3
vendor/koshle/hlekos.cpp
vendored
@@ -24,7 +24,7 @@ void * maple_dev_status(maple_device*) {
|
||||
maple_device_t * maple_enum_type(int n, uint32 func) {
|
||||
return &dev;
|
||||
}
|
||||
|
||||
namespace kos {
|
||||
int sem_wait_timed(semaphore_t *sem, int timeout) {
|
||||
auto count = sem->count.load();
|
||||
|
||||
@@ -54,6 +54,7 @@ int sem_signal(semaphore_t *sem) {
|
||||
sem->count++;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void sq_lock(void *dest) {
|
||||
|
||||
|
3
vendor/koshle/kos/sem.h
vendored
3
vendor/koshle/kos/sem.h
vendored
@@ -32,6 +32,7 @@
|
||||
|
||||
\headerfile kos/sem.h
|
||||
*/
|
||||
namespace kos {
|
||||
typedef struct semaphore {
|
||||
std::atomic<int> initialized; /**< \brief Are we initialized? */
|
||||
std::atomic<int> count; /**< \brief The semaphore count */
|
||||
@@ -177,5 +178,7 @@ int sem_signal(semaphore_t *sem);
|
||||
*/
|
||||
int sem_count(semaphore_t *sem);
|
||||
|
||||
}
|
||||
using namespace kos;
|
||||
|
||||
#endif /* __KOS_SEM_H */
|
||||
|
2
vendor/koshle/pvr_internal.h
vendored
2
vendor/koshle/pvr_internal.h
vendored
@@ -233,7 +233,7 @@ typedef struct {
|
||||
|
||||
/* Wait-ready semaphore: this will be signaled whenever the pvr_wait_ready()
|
||||
call should be ready to return. */
|
||||
semaphore_t ready_sem;
|
||||
kos::semaphore_t ready_sem;
|
||||
|
||||
// Handle for the vblank interrupt
|
||||
int vbl_handle;
|
||||
|
Reference in New Issue
Block a user