Merge branch 'main' into Breakpoints-improvements

grumpycoders · Dec 11, 2024 · a3353a6 · a3353a6
2 parents 5ce6d40 + e579cd7
commit a3353a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -39,7 +39,7 @@ jobs:
         path: '**/*.ps-exe'
 
   macos-intel-build-and-test:
-    runs-on: macos-12
+    runs-on: macos-13
     needs: build-openbios
     steps:
     - uses: actions/checkout@v1

diff --git a/src/mips/psyqo/examples/cdrom-demo/cdrom-demo.cpp b/src/mips/psyqo/examples/cdrom-demo/cdrom-demo.cpp
@@ -61,6 +61,7 @@ void CDRomDemo::prepare() {
         .set(psyqo::GPU::Interlace::PROGRESSIVE);
     gpu().initialize(config);
     m_cdrom.prepare();
+    m_cdrom.resetBlocking(gpu());
 }
 
 void CDRomDemo::createScene() {

diff --git a/src/mips/psyqo/src/xprintf.c b/src/mips/psyqo/src/xprintf.c
@@ -223,7 +223,7 @@ static const info fmtinfo[] = {
         'a',
         1024,
         0,
-        0,
+        1,
         0,
         FIXED,
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -223,7 +223,7 @@ static const info fmtinfo[] = { @@
             'a',
 ,
 ,
-,
+,
 ,
             FIXED,
         },
@@ Expand Down @@