Commit Graph
5295 Commits
Author SHA1 Message Date
Johannes Schickel d81bb9794f OPENGL: Prefer single operation texture updates.
When doing glTexSubImage2D we do not need to assure that the source data has
the same width as the texture when we want to update the data, we just need
to assure that the width * Bpp cound matches the pitch.
2011-02-24 17:10:49 +01:00
Johannes Schickel f5e10f33f5 OPENGL: Properly setup pixel data alignment.
If we do not do this, we might end up with a default alignment of 4, which will
fail (as in the graphics will be messed up) in case the screen resolution is
not divisible by 4.

Thanks to digitall for noticing this problem and finding out about
GL_UNPACK_ALIGNMENT.
2011-02-24 05:11:00 +01:00
Johannes Schickel e04d983f68 SDL: Use the SDL_Surface's pitch in copyRectToScreen.
This fixes messed up graphics, when SDL decides to add padding bytes to the
lines of an SDL_Surface. Formerly the code always calculated the pitch via
w*bpp, which of course does not work in all cases.
2011-02-24 04:24:58 +01:00
Johannes Schickel 7f139f8dcf SDL: Output a warning in case the focus rect does not fit inside the screen.
Sadly it seems the engines do not care whether their focus rect really fits
inside the game screen. To ease finding such instances (which might cause odd
clipping by the backend) I added a warning for them.
2011-02-24 01:19:10 +01:00
Johannes Schickel 87f260a66c SDL: Add config file variable to enable the focus rect debug code.
The variable is named "use_sdl_debug_focusrect" for now. The debug code is
still only enabled, when a ScummVM debug version is built though.
2011-02-24 01:15:27 +01:00
Johannes Schickel 466030443a SDL: Add a debug focus rect implementation.
This implementation currently draws a rect frame around the focus rect area.
2011-02-24 01:11:16 +01:00
Johannes Schickel e2aafb603e SDL: Move focus rectangle dummy implementations to .cpp file. 2011-02-24 00:09:25 +01:00
dhewg 2f312e9e1a DS: Disable symbol garbage collection
Only applies when using loadable modules.
This requires a second compile run or black voodoo linker tricks.
Not implemented at this time. Disable it, so we get DS build failure
reports from buildbot (which are useful with all the DISABLE_EVERYTHING
defines).
The resulting binary might be too big to be usable.
2011-02-20 13:09:36 +01:00
dhewg 90fa5087dc ANDROID: Fix cursor scaling 2011-02-19 23:25:05 +01:00
dhewg 6c123974c0 ANDROID: Fix cursor when hotspot coords > 0 2011-02-19 23:24:59 +01:00
Johannes Schickel e21d6e0d11 Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp
2011-02-19 21:46:45 +01:00
Johannes Schickel 32d0e4c15f OPENGLSDL: Avoid warping in warpMouse when the logical coordinates did not change.
This fixes a slight move of the mouse cursor when the hardware mouse position
is at a subpixel from the logical coordinates.
2011-02-19 20:46:47 +01:00
Johannes Schickel 9954eb5a99 OPENGL: Get rid of adjustMouseEvent.
Rather than that I introduced a function which converts hardware screen
coordinates to overlay / game screen coordinates.

The logic which converts mouse movement events with hardware screen
coordinates to overlay / game screen coordinates is now inside notifyEvent.

This is still broken design, since one should not abuse an observer for that.
2011-02-19 20:46:47 +01:00
Johannes Schickel 3aba54b8b0 OPENGL: Fix documentation of OpenGLGraphicsManager::MousePos. 2011-02-19 20:46:47 +01:00
dhewg adf2225eb4 ANDROID: Move helper defines in a new header file
- added a few macros for convinience
- use them
- replaced CHECK_GL_ERROR with GLCALL
- spam GLCALL
2011-02-19 20:15:51 +01:00
dhewg 229e3ca5bf ANDROID: inline some GLESTexture members 2011-02-19 20:15:51 +01:00
dhewg 435069fe4a ANDROID: Supress warning 2011-02-19 20:15:50 +01:00
dhewg feb0efe767 ANDROID: Formatting 2011-02-19 20:15:50 +01:00
dhewg d7422de7f7 ANDROID: Fix make dependencies for parallel builds 2011-02-19 18:05:36 +01:00
dhewg 3a86b5f285 ANDROID: Remove outdated build instructions
See http://wiki.scummvm.org/index.php/Compiling_ScummVM/Android
2011-02-18 22:27:06 +01:00
dhewg 84e632cc9d ANDROID: Formatting
maybe now?
2011-02-18 21:38:26 +01:00
dhewg 106253b8b9 ANDROID: Formatting
and hoping for buildbot to pick up the toolchain now
2011-02-18 21:32:37 +01:00
dhewg 1b41de4ad8 ANDROID: dist target for buildbot 2011-02-18 20:18:13 +01:00
Marcus Comstedt 106380d481 DC: Don't use $(VER_REV) with git
It seems unlikely that git will ever be able to produce a $(VER_REV)
of 6 characters or less (the requirement for the version field in
IP.BIN), so don't even try to use it.
2011-02-18 20:12:16 +01:00
dhewg 8cddb2a401 Merge branch 'dhewg-android' 2011-02-18 17:18:27 +01:00
Johannes Schickel 4115c97883 BACKENDS: Adapt DefaultPaletteManager to setPalette/grabPalette RGBA->RGB change. 2011-02-16 16:22:52 +01:00
Fabio Battaglia 68e468ee01 N64: revert fix in svn r55745 and added a FIXME
The sign comparison fix requires a little more work than int->uint change, else it
throws an exception on the N64
2011-02-16 09:51:32 +01:00
Johannes Schickel 123f81f837 WII: Fix OSystem_Wii::setPalette after the ScummVM upstream merge in a024546.
I accidently removed two lines when doing the merge since I read the log
incorrectly. Thanks to dhewg for reporting this.
2011-02-16 00:52:52 +01:00
Johannes Schickel c9a9f7b48f IPHONE: Remove erroneous write in OSystem_IPHONE::grabPalette.
Thanks to dhewg for reporting this!
2011-02-16 00:44:14 +01:00
Johannes Schickel 46c5732ba5 PS2: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested.
2011-02-16 00:10:40 +01:00
Johannes Schickel 462f06d806 DC: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested, but should hopefully work fine.
2011-02-16 00:04:25 +01:00
Johannes Schickel a52b16ceb3 N64: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested, but should hopefully work fine.
2011-02-16 00:02:48 +01:00
Johannes Schickel aafebe1389 DS: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested, but should hopefully work fine.
2011-02-15 23:59:31 +01:00
Johannes Schickel 4d30c6f7c9 PSP: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested, but should hopefully work fine.
2011-02-15 23:57:35 +01:00
Johannes Schickel 3c968128ea IPHONE: Adapt to setPalette/grabPalette RGBA->RGB change.
This change is not tested, but should hopefully work fine.
2011-02-15 23:57:10 +01:00
Johannes Schickel a02454644a Merge branch 'master' into osystem-palette
Conflicts:
	backends/platform/wii/osystem_gfx.cpp
2011-02-15 23:42:50 +01:00
dhewg 50129178ef WII: Fix 16bit cursors on some HE games 2011-02-14 22:12:30 +01:00
dhewg ad94ac343a ANDROID: Adapt to [set|grab]Palette RGBA->RGB change. 2011-02-14 20:26:35 +01:00
dhewg 2586e15e4e ANDROID: Fix JNI calls for the timer thread
JNI calls can happen through the timer mechanism (hence from another
thread). Attach the timer thread to the VM to prevent assert()s
2011-02-14 18:58:56 +01:00
dhewg ea2cfc44c0 ANDROID: Fix assert() to log output
add bionic replacement __assert2(), so we actually see what's happening
2011-02-14 18:58:56 +01:00
dhewg 21c2dda5ba ANDROID: Use and reinit texture on screen changes
- EVENT_SCREEN_CHANGED must happen _after_ we have a new surface,
  not when the the old surface vanishes. fixes port on galaxy tab
- textures have to be redefined with glTexImage2D() to make
  glTexSubImage2D() not fail on screen changes
2011-02-14 18:58:56 +01:00
dhewg bf237c8d2c ANDROID: Unify log prefix
adb logcat ScummVM:\* \*:S
2011-02-14 18:58:56 +01:00
dhewg 8de5edde95 ANDROID: Protect port files with our define
get rid of -DANDROID and -DANDROID_BACKEND
2011-02-14 18:58:55 +01:00
dhewg 29d1df94db ANDROID: Allow out-of-src-tree builds, cleanup
- move all android specific make stuff from module.mk to android.mk
- don't create automatically generated files in the source tree
- don't fail when building outside of the source tree
- clean android build files on "make clean"
- cleanup
2011-02-14 18:58:55 +01:00
dhewg 57bc9b3f95 ANDROID: Allow monolithic builds to run
this gets rid of the "no plugins found, go to market, kthx" message,
which doesn't make sense on monolithic builds (market only has
ancient apk's anyway)
2011-02-14 18:58:55 +01:00
dhewg f850ad2ced WII: Adapt to [set|grab]Palette RGBA->RGB change. 2011-02-14 17:08:33 +01:00
Johannes Schickel 6adfbe5f54 OPENGL: Adapt the OpenGL module to the setPalette/grabPalette RGBA->RGB change. 2011-02-14 17:08:31 +01:00
Johannes Schickel 813f503884 SDL: Adapt SDL graphics module to the setPalette/grabPalette RGBA->RGB change. 2011-02-14 17:08:31 +01:00
dhewg be12529115 GIT: ./tools/update-version.pl 1 3 0 git 2011-02-14 11:21:27 +01:00
dhewg d794bfc4fa GIT: use git for describing the version. 2011-02-12 19:03:36 +01:00