From e27c276daa300ecc3c8d86774b8fc0d51d6f1bca Mon Sep 17 00:00:00 2001 From: falco Date: Thu, 16 Feb 2023 17:09:15 -0500 Subject: [PATCH] Fixed poly/tri/quadmarks to build with GCC12 "start" is a reserved symbol within KOS, per crt1.s. Not sure why the old toolchains let us use this symbol name elsewhere, but the new GCC12 toolchain rightfully complains about duplicate symbols. - Renamed "start" timestamp to "begin." --- samples/polymark/main.c | 8 ++++---- samples/quadmark/main.c | 8 ++++---- samples/trimark/main.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/polymark/main.c b/samples/polymark/main.c index 60d396b..2a58c45 100644 --- a/samples/polymark/main.c +++ b/samples/polymark/main.c @@ -100,7 +100,7 @@ void do_frame() { glKosSwapBuffers(); } -time_t start; +time_t begin; void switch_tests(int ppf) { printf("Beginning new test: %d polys per frame (%d per second at 60fps)\n", ppf * 3, ppf * 3 * 60); @@ -113,8 +113,8 @@ void check_switch() { now = time(NULL); - if(now >= (start + 5)) { - start = time(NULL); + if(now >= (begin + 5)) { + begin = time(NULL); printf(" Average Frame Rate: ~%f fps (%d pps)\n", avgfps, (int)(polycnt * avgfps * 2)); switch(phase) { @@ -165,7 +165,7 @@ int main(int argc, char **argv) { /* Start off with something obscene */ switch_tests(200000 / 60); - start = time(NULL); + begin = time(NULL); for(;;) { if(check_start()) diff --git a/samples/quadmark/main.c b/samples/quadmark/main.c index 847c9f6..4da3046 100644 --- a/samples/quadmark/main.c +++ b/samples/quadmark/main.c @@ -112,7 +112,7 @@ void do_frame() { glKosSwapBuffers(); } -time_t start; +time_t begin; void switch_tests(int ppf) { printf("Beginning new test: %d polys per frame (%d per second at 60fps)\n", ppf * 2, ppf * 2 * 60); @@ -125,8 +125,8 @@ void check_switch() { now = time(NULL); - if(now >= (start + 5)) { - start = time(NULL); + if(now >= (begin + 5)) { + begin = time(NULL); printf(" Average Frame Rate: ~%f fps (%d pps)\n", avgfps, (int)(polycnt * avgfps * 2)); switch(phase) { @@ -184,7 +184,7 @@ int main(int argc, char **argv) { /* Start off with something obscene */ switch_tests(200000 / 60); - start = time(NULL); + begin = time(NULL); uint32_t iterations = 2000; diff --git a/samples/trimark/main.c b/samples/trimark/main.c index 3bd2004..2b542cb 100644 --- a/samples/trimark/main.c +++ b/samples/trimark/main.c @@ -93,7 +93,7 @@ void do_frame() { glKosSwapBuffers(); } -time_t start; +time_t begin; void switch_tests(int ppf) { printf("Beginning new test: %d polys per frame (%d per second at 60fps)\n", ppf * 2, ppf * 2 * 60); @@ -106,8 +106,8 @@ void check_switch() { now = time(NULL); - if(now >= (start + 5)) { - start = time(NULL); + if(now >= (begin + 5)) { + begin = time(NULL); printf(" Average Frame Rate: ~%f fps (%d pps)\n", avgfps, (int)(polycnt * avgfps * 2)); switch(phase) { @@ -155,7 +155,7 @@ int main(int argc, char **argv) { /* Start off with something obscene */ switch_tests(220000 / 60); - start = time(NULL); + begin = time(NULL); for(;;) { if(check_start())