snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into linux

This commit is contained in:
Vinyl Darkscratch 2018-07-03 11:51:44 -07:00
parent 0c2b3f36a5 4553e2f2bf
commit aa421131eb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make-oneshot-mac.command
View File

@ -4,7 +4,7 @@ set -e
cd `dirname $0` cd `dirname $0`
# User-configurable variables # User-configurable variables
mac_version="1.0.2" mac_version="1.0.4"
make_threads=8 make_threads=8
ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot

2
patches/mac/Info.plist.in
View File

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>macOS Port v.ONESHOTMACVERSION (OneShot Solstice Update)</string> <string>macOS Port v.ONESHOTMACVERSION</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>ONESHOTMACVERSION</string> <string>ONESHOTMACVERSION</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

6
src/graphics.cpp
View File

@ -743,6 +743,9 @@ void Graphics::transition(int duration,
setBrightness(255); setBrightness(255);
/* Capture new scene */
p->screen.composite();
/* The PP frontbuffer will hold the current scene after the /* The PP frontbuffer will hold the current scene after the
* composition step. Since the backbuffer is unused during * composition step. Since the backbuffer is unused during
* the transition, we can reuse it as the target buffer for * the transition, we can reuse it as the target buffer for
@ -750,9 +753,6 @@ void Graphics::transition(int duration,
TEXFBO &currentScene = p->screen.getPP().frontBuffer(); TEXFBO &currentScene = p->screen.getPP().frontBuffer();
TEXFBO &transBuffer = p->screen.getPP().backBuffer(); TEXFBO &transBuffer = p->screen.getPP().backBuffer();
/* Capture new scene */
p->screen.composite();
/* If no transition bitmap is provided, /* If no transition bitmap is provided,
* we can use a simplified shader */ * we can use a simplified shader */
TransShader &transShader = shState->shaders().trans; TransShader &transShader = shState->shaders().trans;