Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ps vita support #901

Closed
wants to merge 62 commits into from
Closed

Add ps vita support #901

wants to merge 62 commits into from

Conversation

@Cpasjuste
Copy link
Contributor

Cpasjuste commented Feb 11, 2017

Hi,

I think i have now reached a point where it's ok to merge with mainline. There is a very few modifications to stock sources (sdl-event: fix cursor lag on some platform, posix-fs, posix-main and surfacesdl-graphics with psp2 defines). By the way, i think the code in surfacesdl-graphics (for other sdl2 platform than the ps vita) could maybe be improved by directly writing to the SDL2 texture pixels (LockTexture) instead SDL2 surface -> SDL2 texture, and maybe moving to SDL2/GL for shader effects instead software scaling/effects. I may take a look if i ever find the time.

Else thanks for this awesome application :)

Cpasjuste and others added 4 commits Feb 18, 2017
PSP2: Fix slow analog joystick mouse modifier and improved gamepad button mapping
SDL: improved internal joystick event handling
@Cpasjuste
Copy link
Contributor Author

Cpasjuste commented Feb 19, 2017

Hi,

Thanks for the reports/tips. It may take me while to rebase this as I'm not used to "advanced" git functions, and my time is very limited. I'll tr try do do that next week !

@sev-
Copy link
Member

sev- commented Feb 19, 2017

If you provide me with access to your fork, I Candi the rebase for you. Also, you may just follow the step by step guidance provided by GitHub, talking about forks

@Cpasjuste
Copy link
Contributor Author

Cpasjuste commented Feb 19, 2017

Hi @sev- , in fact this would be very cool if its not too much work for you. I'm sure it would take me a lot of time to do so. This week I will fix the problems (bad tabs/spaces and other suggestions) then we can go further together. I'll let you know when its done

Cpasjuste and others added 10 commits Feb 19, 2017
PSP2: enabled 16-bit color flag to support a few more games
Fixes erratic speeds in analog pointer motion
Implemented option to set analog/keyboard pointer speed
and control the analog joystick deadzone.
- R is now also shift, this enables "Mass Add..." button in menu
- The aspect ratio correction is now done in hardware on PSP2
- The aspect ratio correction now increases the height instead of
decreasing the width, if it fits on the screen
- If Fullscreen is OFF, the screen is hardware-scaled by a factor 2x
automatically if the result fits on the screen. This scaling makes use
of the user-selected shader and the graphics filtering.
refactored shader menu code to be compatible with mainline ScummVM
@rsn8887
Copy link
Contributor

rsn8887 commented Feb 24, 2017

I just updated my local PR, PR#11 on Cpasjuste's master branch https://github.com/Cpasjuste/scummvm/pull/11
that features many enhancements (also some refactoring). I think my PR should become part of this PR before rebasing this because it enhances the shader selection etc. It

  • adds a universal shader menu that is hidden unless the platform supports shaders (see comments at https://github.com/Cpasjuste/scummvm/pull/11 )
  • the menu allows PSP2 users to select their favorite shader in addition to any software scaler they might like
  • The menu does not add any platform code to the COMMON namespace.
  • It makes use only of three new system function getSupportedShaders, setShader, getShader that mirror the GraphicsMode selection functions.
  • It allows any platform to implement HW shaders in addition to software scalers (currently the PSP2 port is the only one using these functions), and the menu is displayed only if kFeatureShaders is set.

See https://github.com/Cpasjuste/scummvm/pull/11
for more detailed comments.

@sev-
Copy link
Member

sev- commented Feb 26, 2017

When do you think it will be a good time to rebase?

rsn8887 and others added 2 commits Feb 26, 2017
- control options tab is moved past graphics options tab
- control tab is not the default anymore
- changed label of "Mouse Speed" option to "Pointer Speed"
- changed Pointer Speed infotip description to make it more clear
PSP2: Fix erratic pointer speeds, add pointer speed/deadzone and shader selection menus
@rsn8887
Copy link
Contributor

rsn8887 commented Feb 26, 2017

sev the conflicting files are because of the addition of the new shader menu (visible currently only on Vita). Can I help to merge them correctly? Is there a way to "pre-merge" them? I am not sure how.

@sev-
Copy link
Member

sev- commented Feb 26, 2017

Well, the whole branch needs to be rebased. The process is pretty straightforward and is described here: https://help.github.com/articles/syncing-a-fork/

Now, on your case. You'd better move the PR to a fork:

  1. git checkout -b ps-vita
  2. git push origin ps-vita:ps-vita
  3. Reset master to upstream.

Now sync with the upstream

  1. Add upstream: git remote add upstream https://github.com/scummvm/scummvm.git
  2. Fetch upstream master: git fetch upstream
  3. Checkout your master: git checkout master
  4. Merge upstream: git merge upstream/master
  5. Rebase your fork: git rebase master

Now it will stop on the merge conflicts, and you will need to fix them.

If you need help, tell.

@wjp
Copy link
Member

wjp commented Feb 27, 2017

Cleaning the history of this PR up should probably wait until #911 and #912 are reviewed and merged, as they will cause additional conflicts.

@rsn8887
Copy link
Contributor

rsn8887 commented Feb 28, 2017

I made @sev- 's suggested changes to my branch here: rsn8887@fd0a478. Due to many many merge conflicts and other problems with rebasing this, I think we should just merge a "single-commit" version of the whole Vita branch, such as in my branch here https://github.com/rsn8887/scummvm/tree/mastermerged20170228.

That will be easier to merge (no rebase necessary). Concerning the loss of history, there's not that much value in the history in the commit messages so far since it is all basically "initial Vita branch." It will still be a small single commit with 109 files changed, it is really quite graspable.

I will wait until #911 and #912 have been merged before proceeding, since those will remove some duplicate similar changes in the Vita branch.

After that I will re-generate the "single-commit" Vita branch and make a separate PR for it.

@rsn8887
Copy link
Contributor

rsn8887 commented Mar 2, 2017

Since this is more or less un-rebaseable without going through every single merge-conflict over ages, I made a single-commit version of this here: #915

@sev-
Copy link
Member

sev- commented Mar 2, 2017

Closing the the favor of #915

@sev- sev- closed this Mar 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.