TrustedUser
2,147
edits
Difference between revisions of "AGS/Upstream"
Jump to navigation
Jump to search
Update status
(Update upstream commit we are currently sync'ed with) |
(Update status) |
||
| Line 7: | Line 7: | ||
This page contains the details of commits from the upstream AGS that either haven't been done yet due to various issues, or are being explicitly skipped due to changes that have been done in the ScummVM implementation. | This page contains the details of commits from the upstream AGS that either haven't been done yet due to various issues, or are being explicitly skipped due to changes that have been done in the ScummVM implementation. | ||
ScummVM currently matches upstream commit <code> | ScummVM currently matches upstream commit <code> 81b5fbc917d83a02cebc152969fd769b2b7b9b15 - Updated build version (3.6.0.41), changed to RC</code> from January 16, 2023 | ||
== Still pending == | == Still pending == | ||
| Line 32: | Line 32: | ||
* All the commits related to the "touch-to-mouse emulation" (https://github.com/adventuregamestudio/ags/pull/1773) | * All the commits related to the "touch-to-mouse emulation" (https://github.com/adventuregamestudio/ags/pull/1773) | ||
Is this relevant for ScummVM? | Is this relevant for ScummVM? | ||
* fbb87c3370501d9acad9c7282c5e951032587c9e - Engine: fixed TOUCH hints breaking compilation against older SDL2 | |||
* Some Direct3D and OpenGL related commits, not used in ScummVM, but part of it may need to be reimplemented/adapted: | |||
** 484f416cc35cd76231854edfa4756272b888a91a - Direct3D, OpenGL: replace viewport hacks with proper transform matrix | |||
** 490522fdd412dcdb3c687f88143a62eb935de11a - Direct3D: support sprite batches rendering to a texture | |||
** f1bc41994188eb4330c031a611bc72398ff1d405 - OGL: support sprite batches rendering to a texture | |||
** 2a7895cde22b32bbc7ea60bc23e64152c80d6f80 - Engine: render GUI & controls batch to a buffer texture | |||
** c91d3e70ceb9fdd0874dde80d806d8b927302bdd - Direct3D: implement proper blend op settings for a custom render target | |||
** 3f086f1ef91d37b1d90208b798adf9a9b884a06e - OpenGL: implement proper blend op settings for a custom render target | |||
** 5d72fe112cf08d82454e1bf55538ba8eb798461d - Engine: release render targets before switching the gfx mode | |||
** bb039ddc807fc9df00baa184bde35b62b3f19bf4 - OpenGL: fixed custom render targets in "screen resolution" mode | |||
** 4b900d73b5f544017c1935ddf542af7277ca752d - OpenGL: work with render targets of various sizes | |||
** 14eb84c28a75e9756519c17aeaacce8b16343c9d - Direct3D: work with render targets of various sizes | |||
** 6fec4943006960ae0a862e9e2af250ae4f9af8c5 - Direct3D: fixed rendering at screen resolution (when not stretched) | |||
** d2f61af07f9751174a4859769570467669c2b1d2 - Engine: update render target if the GUI got resized | |||
* 6fd7200ec85ace0abc5020faf79608f3385064e1 - Engine: use unique_ptr in VideoMemoryGraphicsDriver::ScreenFx | |||
Couldn't get it to work with scummvm's implementation | |||
== Currently skipped == | == Currently skipped == | ||
| Line 87: | Line 103: | ||
* 6fc888e04c4130fb4f58bc2608438c4057cb0701 - Engine: fix gfx sw driver presented offset twice | * 6fc888e04c4130fb4f58bc2608438c4057cb0701 - Engine: fix gfx sw driver presented offset twice | ||
Blitting code is different, should be fixed already | Blitting code is different, should be fixed already | ||
* 41eb660d599e94af31bfeb086392fce5cf1e1116 - Common: add bmp and pcx load and save from stream | |||
And related commits | |||
** c8d12571aba7f38231d9e96ccd6a34cd1bfa09ba - Allegro4: removed bmp and pcx load/save code | |||
** bee3ecb7ef308312fd3149b62bb618e06e8d8310 - Allegro4: removed normal packfile implementation + unused datafile | |||
** 680dc99d730285c3474bcf71494f1fdff694e8a3 - fix Makefile-defs.allegro | |||
** 869bfd248929fc76dca506d73f05bcd5e063fd86 - Common: in bitmap loader replaced WRITE3BYTES with a Memory function | |||
** 6aeb7d77ec15a61d208a012e4c855b4506155951 - Common: fixed Bitmap's SaveToFile not testing an opened stream | |||
* 1b71780d6e94eca33ee3234fd138213874640ab1 - Engine: create raw draw screens only on plugin's demand | |||
Different implementation | |||
* 6dbff91f02f3ee53f1c21b797bf48f68f312b78c - Engine: csci gui messages uses intptr_t insted of long | |||
Better solution already implemented | |||