Commit graph

359 commits

Author SHA1 Message Date
Pawel Kolodziejski
8759900b6a ALL: synced with ScummVM 2014-04-05 18:18:42 +02:00
Johannes Schickel
63304ee9ec SDL: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Pawel Kolodziejski
728dc1f746 JANITORIAL: cleanup after post sync 2014-02-16 16:03:31 +01:00
Pawel Kolodziejski
9098dfe9a2 ALL: sync with scummvm 2014-01-25 22:16:57 +01:00
Johannes Schickel
2fe303ce3f Merge pull request #409 from lordhoto/rtti
Enable RTTI and clean up the code by exploiting the availability of dynamic_cast.
2014-01-23 15:23:12 -08:00
Dries Harnie
2c936f0334 GRAPHICS: Disable overlay rendering on GL3/ES2 2014-01-14 00:26:41 +01:00
Einar Johan Trøan Sømåen
6677a973c2 SDL: Avoid having SDL_SRCALPHA set even if we have alpha in the pixelformat. 2014-01-11 16:36:04 +01:00
Johannes Schickel
0c7f795c5b SDL: Silence unused variable warning when scalers are disabled. 2014-01-07 01:47:43 +01:00
Johannes Schickel
97953ff40d SDL: Fix return value of getDefaultGraphicsMode when scalers are disabled. 2014-01-07 01:46:28 +01:00
Pawel Kolodziejski
b22d441a00 ALL: synced with scummvm 2013-12-08 13:25:24 +01:00
Einar Johan Trøan Sømåen
9a3c3724f3 BACKEND: Fix fullscreen for AmigaOS4 in Software-mode 2013-10-30 07:02:25 +01:00
Johannes Schickel
cfa6b1b4ae SDL: Further small cleanup related to manager switching. 2013-10-24 00:09:17 +02:00
Johannes Schickel
ea6d38d5f3 SDL: Make activateManager/deactivateManager SdlGraphicsManager specific.
We can do this now that we can use virtual inheritance and dynamic_cast
because we enabled RTTI.
2013-10-24 00:06:32 +02:00
Johannes Schickel
281672e171 SDL: Let SdlGraphicsManager inherit from GraphicsManager. 2013-10-24 00:03:09 +02:00
Johannes Schickel
d34c9d5bcb SDL: Do not require a static graphics mode list in OpenGL and SurfaceSDL. 2013-10-23 22:59:06 +02:00
Johannes Schickel
1a56b521b5 SDL: Always initialize video subsystem in initSDL. 2013-10-23 22:58:38 +02:00
Johannes Schickel
6e46e9dfaf SDL: Clean up graphics manager switching slighty.
Sadly this also requires us to extend GraphicsManager for this SDL specific
feature. However, since that's only used in the SDL backend and Tizen it
should be fine for now...
2013-10-23 22:58:34 +02:00
Johannes Schickel
9a80fa88e0 SDL: Do not set Surface::pixels directly anymore. 2013-08-03 04:14:08 +02:00
Johannes Schickel
f386e15b6f SDL: Take advantage of Surface::getPixels. 2013-08-03 04:02:54 +02:00
Johannes Schickel
b7706acb41 SDL: Prefer getBasePtr over direct Surface::pixels access. 2013-08-03 04:02:49 +02:00
Sven Hesse
989ea7cb56 JANITORIAL: Remove trailing whitespace 2013-07-14 19:01:47 +02:00
Pawel Kolodziejski
068ff94d20 ALL: synced with ScummVM 2013-07-07 15:29:33 +02:00
Johannes Schickel
8d6aa77769 GUI: Cleanup EventRecorder::getSurface.
Formerly the function created a SDL_Surface by hand. Instead now it uses
SDL_CreateRGBSurface (which is used in the SDL backend anyway and yields
the same results).

This should fix PS3 port compilation.
2013-07-04 15:43:17 +02:00
Eugene Sandulenko
b286a6d033 RECORDER: Fix guard ifdef 2013-07-04 14:54:56 +03:00
Eugene Sandulenko
f59512c47e RECORDER: Implement Events Recorder 2013-05-17 00:18:09 +03:00
Johannes Schickel
9f22d60adf SDL: Silence C++ narrowing warnings. 2013-01-09 07:24:37 +01:00
Paweł Kołodziejski
175620b62a ALL: change license headers from LGPL to GPL, and few updates 2012-12-19 23:15:43 +01:00
Pawel Kolodziejski
72664703cf ALL: sync with scummvm 2012-07-06 22:05:21 +02:00
Johannes Schickel
aec9b9e22a ALL: Let overlay related methods in OSystem take a void * and use a proper pitch values.
This is a first step to get rid of OverlayColor, which is a requirement for
proper 4Bpp overlay support.
2012-06-16 04:17:14 +02:00
Johannes Schickel
d27d951d0b BACKENDS: Make OSystem::setMouseCursor take a "const void *" buffer.
This is mainly for consistency with OSystem::copyRectToScreen.
2012-06-16 03:28:42 +02:00
Johannes Schickel
31880186e1 BACKENDS: Let copyRectToScreen take a "const void *" instead of "const byte *" as buffer.
This removes the need to convert the parameter to copyRectToScreen to
"const byte *", which is commonly used in games, which use Graphics::Surface
to store their graphics data.
2012-06-16 02:18:01 +02:00
Johannes Schickel
a401f0a19e ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" logic.
All uses of the old target scale API actually wanted to disallow scaling of
the mouse cursor. This commit adapts our API to this and thus simplifies
backend implementations.

Some backends, most notable the Wii and Android, did some implementation of
the cursor target scale, which I didn't adapt yet. I added a TODO for the
porters there.
2012-06-03 02:02:57 +02:00
Max Horn
5de3f9c765 ALL: Correct spelling of "Mac OS X" in various places 2012-05-31 10:30:29 +02:00
Johannes Schickel
223794fb38 ALL: Make use of defined() for the preprocessor consistent.
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
2012-03-17 22:02:44 +01:00
Pawel Kolodziejski
fad0b5b331 ALL: decrease diffs with scummvm 2012-02-22 23:26:36 +01:00
Paweł Kołodziejski
5d200347e6 COMMON, GRIM: fixed compilation after sync 2012-02-22 17:40:48 +01:00
Pawel Kolodziejski
bc71f3f583 synced with scummvm 2012-02-22 17:21:09 +01:00
Bastien Bouclet
00d756433f GRIM: Add return to launcher support.
Also fix a memory leak, and reinitialize a global var in lua
2012-01-31 21:39:34 +01:00
Giulio Camuffo
9424ee667f BACKEND: Flip the screen when it is exposed. 2012-01-31 11:17:09 +01:00
Einar Johan T. Sømåen
bfd2b55749 GRIM: Add support for hot-swapping fullscreen with ALT-ENTER. 2012-01-29 10:28:20 +01:00
Bastien Bouclet
dca3a6dc75 BACKENDS: Add a new OSystem call to lock the mouse in the game window. 2012-01-26 19:35:27 +01:00
Giulio Camuffo
b42bbe5259 TinyGL: Support for different color modes, part 2. 2012-01-24 21:36:47 +01:00
Giulio Camuffo
158a19df31 TinyGL: Support for different color modes, first part. 2012-01-24 21:36:46 +01:00
Paweł Kołodziejski
e350c7f777 renames 2012-01-06 23:29:45 +01:00
Pawe Koodziejski
a5479cfe83 sync with scummvm 2012-01-06 22:56:21 +01:00
Robert Biro
121428a329 SDL: Fixed antialiasing fallback for less tolerant OpenGL drivers. Fix #407 2011-11-30 18:05:31 +00:00
Robert Biro
56208e0ca0 SDL: Added antialiasing support. 2011-10-09 18:13:05 +01:00
Bastien Bouclet
6284ccbc3d SDL: Restore OpenGL's previous state after displaying the overlay 2011-09-18 09:41:42 +02:00
David-John Willis
69683b8ee0 SURFACESDL: Stop forceful resetting of _videoMode.hardware* when calling SurfaceSdlGraphicsManager::loadGFXMode() for the GPH backend.
* Note: This really should be cleaned up and all backends that have a custom loadGFXMode() really should setup their own _videoMode.hardware* settings. Assuming the overlay will always match the hardware is flawed logic on devices with fixed hardware screens.
* Just done for the GPH backend for now to cut down on the regresion risk to other backends near the 1.4.0 release cycle.
2011-10-03 12:24:25 +01:00
Bastien Bouclet
bb0e833fa7 SDL: Fix copying the screen to the overlay
- glReadPixels did not use the correct overlay height
- The copied image was flipped vertically
- Screen change ID was not updated, which prevented the theme engine
from detecting screen resolution changes
2011-08-29 21:44:40 +02:00