Added sdl+vitagl example (#5)

.github/workflows/ci.yml

@@ -11,6 +11,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Install Northfear SDL fork
+        run: |
+          chown -R 1000:1000 northfear-sdl2
+          cd northfear-sdl2
+          sudo --preserve-env=VITASDK -u \#1000 vita-makepkg
+          vdpm sdl2-*-arm.tar.xz
       - name: Build
         run: |
           cargo vita build vpk --release --package vita-std-tests --tests

.github/workflows/release.yml

@@ -17,6 +17,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Install Northfear SDL fork
+        run: |
+          chown -R 1000:1000 northfear-sdl2
+          cd northfear-sdl2
+          sudo --preserve-env=VITASDK -u \#1000 vita-makepkg
+          vdpm sdl2-*-arm.tar.xz
       - name: Build
         run: |
           cargo vita build vpk --release --package vita-std-tests --tests

crates/0-std-tests/src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(fs_try_exists)]
-
 mod tests_fs;
 mod tests_pthread;
 mod tests_tcp;

crates/0-std-tests/src/tests_fs.rs

@@ -6,7 +6,7 @@ mod tests {
 
     impl Drop for FsScope {
         fn drop(&mut self) {
-            if fs::try_exists("ux0:/data/.rust_test").unwrap_or(false) {
+            if fs::exists("ux0:/data/.rust_test").unwrap_or(false) {
                 fs::remove_dir_all("ux0:/data/.rust_test").expect("unable to cleanup");
             }
         }
@@ -54,7 +54,7 @@ mod tests {
         assert!(&data == "contents", "invalid file contents");
 
         assert!(
-            fs::try_exists("ux0:/data/.rust_test/file").unwrap(),
+            fs::exists("ux0:/data/.rust_test/file").unwrap(),
             "file does not exist",
         );
 
@@ -69,7 +69,7 @@ mod tests {
 
         fs::remove_file("ux0:/data/.rust_test/file").expect("unable to delete file");
         assert!(
-            !fs::try_exists("ux0:/data/.rust_test/file").unwrap(),
+            !fs::exists("ux0:/data/.rust_test/file").unwrap(),
             "file exists, but should not",
         );
 

crates/3-sdl/src/main.rs

@@ -1,3 +1,16 @@
+// These linker flags are only necessary with Northfear SDL2 fork
+#[link(name = "SDL2", kind = "static")]
+#[link(name = "vitaGL", kind = "static")]
+#[link(name = "vitashark", kind = "static")]
+#[link(name = "SceShaccCg_stub", kind = "static")]
+#[link(name = "mathneon", kind = "static")]
+#[link(name = "SceShaccCgExt", kind = "static")]
+#[link(name = "taihen_stub", kind = "static")]
+#[link(name = "SceKernelDmacMgr_stub", kind = "static")]
+#[link(name = "SceIme_stub", kind = "static")]
+extern "C" {}
+
+
 use crate::game_of_life::{PLAYGROUND_HEIGHT, PLAYGROUND_WIDTH, SQUARE_SIZE};
 use sdl2::keyboard::Keycode;
 use sdl2::mouse::MouseButton;

crates/4-vitasdk/src/debug/font.rs

@@ -3,7 +3,6 @@ pub struct DebugFont {
     pub width: usize,
     pub height: usize,
     pub first: u8,
-    pub last: u8,
     pub size_w: usize,
     pub size_h: usize,
 }
@@ -13,7 +12,6 @@ pub const DEBUG_FONT: DebugFont = DebugFont {
     width: 8,
     height: 8,
     first: 0,
-    last: 255,
     size_w: 8,
     size_h: 8,
 };

crates/4-vitasdk/src/main.rs

@@ -1,6 +1,6 @@
 use std::backtrace::Backtrace;
 use std::fmt::Write;
-use std::panic::{self, PanicInfo};
+use std::panic::{self, PanicHookInfo};
 use std::thread;
 use std::time::Duration;
 
@@ -25,7 +25,7 @@ pub fn main() {
     thread::sleep(Duration::from_secs(5));
 }
 
-fn custom_panic_hook(info: &PanicInfo<'_>) {
+fn custom_panic_hook(info: &PanicHookInfo<'_>) {
     // The current implementation always returns `Some`.
     let location = info.location().unwrap();
 

crates/5-vitasdk-gles/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "vita-example-sdl-gles"
+version = "0.1.0"
+edition = "2021"
+
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/vita-rust/examples"
+homepage = "https://github.com/vita-rust/examples/crates/4-vitasdk"
+
+description = "VITASDK example"
+
+[dependencies]
+rand = "0.8.5"
+gl = "0.10.0"
+sdl2 = { version = "0.35.2", features = ["use-pkgconfig"] }
+
+[package.metadata.vita]
+title_id = "RUSTTEST5"
+title_name = "SDL+GL test"

crates/5-vitasdk-gles/src/main.rs

@@ -0,0 +1,43 @@
+#[link(name = "SDL2", kind = "static")]
+#[link(name = "vitaGL", kind = "static")]
+#[link(name = "vitashark", kind = "static")]
+#[link(name = "SceShaccCg_stub", kind = "static")]
+#[link(name = "mathneon", kind = "static")]
+#[link(name = "SceShaccCgExt", kind = "static")]
+#[link(name = "taihen_stub", kind = "static")]
+#[link(name = "SceKernelDmacMgr_stub", kind = "static")]
+#[link(name = "SceIme_stub", kind = "static")]
+extern "C" {}
+
+fn main() {
+    let sdl = sdl2::init().unwrap();
+    let video_subsystem = sdl.video().unwrap();
+    let window = video_subsystem
+        .window("Game", 900, 700)
+        .opengl()
+        .build()
+        .unwrap();
+
+    let _gl_context = window.gl_create_context().unwrap();
+    let _gl = gl::load_with(|s| video_subsystem.gl_get_proc_address(s) as *const std::os::raw::c_void);
+
+    unsafe {
+        gl::ClearColor(0.3, 0.3, 0.5, 1.0);
+    }
+
+    let mut event_pump = sdl.event_pump().unwrap();
+    'main: loop {
+        for event in event_pump.poll_iter() {
+            match event {
+                sdl2::event::Event::Quit {..} => break 'main,
+                _ => {},
+            }
+        }
+
+        unsafe {
+            gl::Clear(gl::COLOR_BUFFER_BIT);
+        }
+
+        window.gl_swap_window();
+    }
+}

northfear-sdl2/.gitignore

@@ -0,0 +1,4 @@
+src
+pkg
+*gz
+*xz

northfear-sdl2/VITABUILD

@@ -0,0 +1,36 @@
+pkgname=sdl2
+pkgver=2.24.0
+pkgrel=1
+gitrev=0867aceb28a493b489f54a3407a3b820b092206a
+url='https://www.libsdl.org'
+source=(
+  "https://github.com/Northfear/SDL/archive/${gitrev}.tar.gz"
+ )
+sha256sums=(
+  SKIP
+)
+
+pkgver() {
+  cd "SDL-${gitrev}"
+  ref_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION  *//p' include/SDL_version.h)
+  ref_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION  *//p' include/SDL_version.h)
+  ref_micro=$(sed -ne 's/^#define SDL_PATCHLEVEL  *//p' include/SDL_version.h)
+  echo "${ref_major}.${ref_minor}.${ref_micro}"
+}
+
+prepare() {
+  cd "SDL-${gitrev}"
+}
+
+build() {
+  cd "SDL-${gitrev}"
+  rm -rf build; mkdir build && cd build
+  cmake .. -DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSDL_TEST=OFF -DVIDEO_VITA_VGL=ON
+  make -j$(nproc)
+}
+
+package () {
+  cd "SDL-${gitrev}"
+  cd build
+  make DESTDIR=$pkgdir install
+}