From: notaz <notasas@gmail.com>
Date: Tue, 28 Nov 2023 00:09:45 +0000 (+0200)
Subject: unbreak the build of gpu thread thing
X-Git-Tag: r24l~38
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3890db8ef473ee5eae6a7120ee39d761a86620;p=pcsx_rearmed.git

unbreak the build of gpu thread thing

and hope it still works
---

diff --git a/plugins/gpulib/gpulib_thread_if.c b/plugins/gpulib/gpulib_thread_if.c
index c18a6f60..d456f03c 100644
--- a/plugins/gpulib/gpulib_thread_if.c
+++ b/plugins/gpulib/gpulib_thread_if.c
@@ -74,7 +74,7 @@ static void *video_thread_main(void *arg) {
 #endif /* _3DS */
 
 	while(1) {
-		int result, last_cmd, start, end;
+		int result, cpu_cycles = 0, last_cmd, start, end;
 		video_thread_queue *queue;
 		pthread_mutex_lock(&thread->queue_lock);
 
@@ -95,8 +95,8 @@ static void *video_thread_main(void *arg) {
 
 		for (i = start; i < end; i++) {
 			cmd = &queue->queue[i];
-			result = real_do_cmd_list(cmd->cmd_list, cmd->count, &last_cmd);
-
+			result = real_do_cmd_list(cmd->cmd_list, cmd->count,
+					&cpu_cycles, &last_cmd);
 			if (result != cmd->count) {
 				fprintf(stderr, "Processed wrong cmd count: expected %d, got %d\n", cmd->count, result);
 			}
@@ -348,14 +348,14 @@ static int scan_cmd_list(uint32_t *data, int count, int *last_cmd)
 	return pos;
 }
 
-int do_cmd_list(uint32_t *list, int count, int *last_cmd) {
+int do_cmd_list(uint32_t *list, int count, int *cycles, int *last_cmd) {
 	int pos = 0;
 
 	if (thread.running) {
 		pos = scan_cmd_list(list, count, last_cmd);
 		video_thread_queue_cmd(list, pos, *last_cmd);
 	} else {
-		pos = real_do_cmd_list(list, count, last_cmd);
+		pos = real_do_cmd_list(list, count, cycles, last_cmd);
 		memcpy(gpu.ex_regs, gpu.scratch_ex_regs, sizeof(gpu.ex_regs));
 	}
 	return pos;
@@ -378,8 +378,8 @@ void renderer_finish(void) {
 
 void renderer_sync_ecmds(uint32_t * ecmds) {
 	if (thread.running) {
-		int dummy;
-		do_cmd_list(&ecmds[1], 6, &dummy);
+		int dummy = 0;
+		do_cmd_list(&ecmds[1], 6, &dummy, &dummy);
 	} else {
 		real_renderer_sync_ecmds(ecmds);
 	}
diff --git a/plugins/gpulib/gpulib_thread_if.h b/plugins/gpulib/gpulib_thread_if.h
index 8ce328e7..3f0cf18c 100644
--- a/plugins/gpulib/gpulib_thread_if.h
+++ b/plugins/gpulib/gpulib_thread_if.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-int  real_do_cmd_list(uint32_t *list, int count, int *last_cmd);
+int  real_do_cmd_list(uint32_t *list, int count, int *cycles, int *last_cmd);
 int  real_renderer_init(void);
 void real_renderer_finish(void);
 void real_renderer_sync_ecmds(uint32_t * ecmds);