Merge branch 'master' of https://github.com/libretro/virtualjaguar-libretro

Author: JoeMatt

.github/CODEOWNERS

@@ -0,0 +1 @@
+*       @JoeMatt @twinaphex 

.github/workflows/pull-request.yml

@@ -0,0 +1,19 @@
+name: Pull Request on Branch Push
+on:
+  push:
+    branches-ignore:
+      - staging
+      - launchpad
+      - production
+jobs:
+  auto-pull-request:
+    name: PullRequestAction
+    runs-on: ubuntu-latest
+    steps:
+      - name: pull-request-action
+        uses: vsoch/pull-request-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH_PREFIX: 'feature/'
+          PULL_REQUEST_BRANCH: 'master'
+          PULL_REQUEST_DRAFT: true

.github/workflows/rebase.yml

@@ -0,0 +1,20 @@
+# https://github.com/marketplace/actions/automatic-rebase
+name: Automatic Rebase
+on:
+  issue_comment:
+    types: [created]
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Automatic Rebase
+        uses: cirrus-actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -188,14 +188,17 @@ else ifeq ($(platform), libnx)
 	STATIC_LINKING = 1
 
 # Lightweight PS3 Homebrew SDK
-else ifeq ($(platform), psl1ght)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = $(PS3DEV)/ppu/bin/ppu-gcc$
-	CXX = $(PS3DEV)/ppu/bin/ppu-g++$
-	AR = $(PS3DEV)/ppu/bin/ppu-ar$
+else ifneq (,$(filter $(platform), ps3 psl1ght))
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
+	CXX = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)g++$(EXE_EXT)
+	AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
 	STATIC_LINKING = 1
-	FLAGS += -DMSB_FIRST
+	FLAGS += -DMSB_FIRST -D__PS3__
 	OLD_GCC = 1
+	ifeq ($(platform), psl1ght)
+		FLAGS += -D__PSL1GHT__
+	endif
 
 # PSP
 else ifeq ($(platform), psp1)

libretro.c

@@ -163,6 +163,11 @@ static void update_input(void)
    joypad0Buttons[BUTTON_4]      = 0x00;
    joypad0Buttons[BUTTON_5]      = 0x00;
    joypad0Buttons[BUTTON_6]      = 0x00;
+   joypad0Buttons[BUTTON_7]      = 0x00;
+   joypad0Buttons[BUTTON_8]      = 0x00;
+   joypad0Buttons[BUTTON_9]      = 0x00;
+   joypad0Buttons[BUTTON_s]      = 0x00;
+   joypad0Buttons[BUTTON_d]      = 0x00;
 
    joypad1Buttons[BUTTON_U]      = 0x00;
    joypad1Buttons[BUTTON_D]      = 0x00;
@@ -180,6 +185,11 @@ static void update_input(void)
    joypad1Buttons[BUTTON_4]      = 0x00;
    joypad1Buttons[BUTTON_5]      = 0x00;
    joypad1Buttons[BUTTON_6]      = 0x00;
+   joypad1Buttons[BUTTON_7]      = 0x00;
+   joypad1Buttons[BUTTON_8]      = 0x00;
+   joypad1Buttons[BUTTON_9]      = 0x00;
+   joypad1Buttons[BUTTON_s]      = 0x00;
+   joypad1Buttons[BUTTON_d]      = 0x00;
 
    if (libretro_supports_bitmasks)
    {
@@ -257,20 +267,30 @@ static void update_input(void)
       joypad1Buttons[BUTTON_PAUSE] = 0xff;
    if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_START))
       joypad1Buttons[BUTTON_OPTION] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_X))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_X) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_p)? 1 : 0))
       joypad1Buttons[BUTTON_0] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_q)? 1 : 0))
       joypad1Buttons[BUTTON_1] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_w)? 1 : 0))
       joypad1Buttons[BUTTON_2] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L2))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L2) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_e)? 1 : 0))
       joypad1Buttons[BUTTON_3] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R2))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R2) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_r)? 1 : 0))
       joypad1Buttons[BUTTON_4] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L3))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_L3) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_t)? 1 : 0))
       joypad1Buttons[BUTTON_5] = 0xff;
-   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R3))
+   if (ret[1] & (1 << RETRO_DEVICE_ID_JOYPAD_R3) || (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_y)? 1 : 0))
       joypad1Buttons[BUTTON_6] = 0xff;
+   if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_u)? 1 : 0))
+      joypad1Buttons[BUTTON_7] = 0xff;
+   if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_i)? 1 : 0))
+      joypad1Buttons[BUTTON_8] = 0xff;
+   if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_o)? 1 : 0))
+      joypad1Buttons[BUTTON_9] = 0xff;
+   if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_LEFTBRACKET)? 1 : 0))
+	  joypad1Buttons[BUTTON_s] = 0xff;
+   if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_RIGHTBRACKET)? 1 : 0))
+	  joypad1Buttons[BUTTON_d] = 0xff;
 }
 
 static void extract_basename(char *buf, const char *path, size_t size)
@@ -318,8 +338,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    info->timing.sample_rate    = SAMPLERATE;
    info->geometry.base_width   = game_width;
    info->geometry.base_height  = game_height;
-   info->geometry.max_width    = TOMGetVideoModeWidth();
-   info->geometry.max_height   = TOMGetVideoModeHeight();
+   info->geometry.max_width    = 652; // Highest value encountered during testing
+   info->geometry.max_height   = vjs.hardwareTypeNTSC ? 240 : 256;
    info->geometry.aspect_ratio = 4.0 / 3.0;
 }
 
@@ -548,5 +568,18 @@ void retro_run(void)
 
    JaguarExecuteNew();
    SoundCallback(NULL, sampleBuffer, vjs.hardwareTypeNTSC==1?BUFNTSC:BUFPAL);
+
+   // Resolution changed
+   if ((tomWidth != videoWidth || tomHeight != videoHeight) && tomWidth > 0 && tomHeight > 0)
+   {
+      videoWidth = tomWidth, videoHeight = tomHeight;
+      game_width = tomWidth, game_height = tomHeight;
+      
+      JaguarSetScreenPitch(game_width);
+
+      retro_get_system_av_info(&g_av_info);
+      environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &g_av_info);      
+   }
+
    video_cb(videoBuffer, game_width, game_height, game_width << 2);
 }