thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Remove again updateEventScale

Browse source 
It was removed in android in #1695 but not in android3d in ResidualVM.
This commit is contained in:
Le Philousophe 2021-11-07 10:52:08 +01:00 • committed by Paweł Kołodziejski
parent 5b62141b8f
commit d6f37a161b
4 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backends/graphics3d/android/android-graphics3d.cpp
View file

@ -156,7 +156,6 @@ void AndroidGraphics3dManager::initSurface() {
updateScreenRect();
// double buffered, flip twice
clearScreen(kClearUpdate, 2);
updateEventScale();
dynamic_cast<OSystem_Android *>(g_system)->getTouchControls().init(
JNI::egl_surface_width, JNI::egl_surface_height);
@ -367,8 +366,6 @@ void AndroidGraphics3dManager::showOverlay() {
}
}
updateEventScale();
warpMouse(_overlay_texture->width() / 2, _overlay_texture->height() / 2);
GLCALL(glDisable(GL_SCISSOR_TEST));
@ -387,8 +384,6 @@ void AndroidGraphics3dManager::hideOverlay() {
JNI::setTouch3DMode(true);
updateEventScale();
warpMouse(_game_texture->width() / 2, _game_texture->height() / 2);
// double buffered, flip twice
@ -565,7 +560,6 @@ void AndroidGraphics3dManager::initSizeIntern(uint width, uint height,
_frame_buffer->attach();
updateScreenRect();
updateEventScale();
// Don't know mouse size yet - it gets reallocated in
// setMouseCursor. We need the palette allocated before
@ -875,13 +869,6 @@ void AndroidGraphics3dManager::initViewport() {
LOGD("viewport size: %dx%d", JNI::egl_surface_width, JNI::egl_surface_height);
}
void AndroidGraphics3dManager::updateEventScale() {
const GLESBaseTexture *texture = getActiveTexture();
if (texture) {
dynamic_cast<OSystem_Android *>(g_system)->updateEventScale(texture->width(), texture->height());
}
}
void AndroidGraphics3dManager::clearScreen(FixupType type, byte count) {
assert(count > 0);

1
backends/graphics3d/android/android-graphics3d.h
View file

@ -134,7 +134,6 @@ private:
void disableCursorPalette();
void initOverlay();
void initViewport();
void updateEventScale();
void initSizeIntern(uint width, uint height, const Graphics::PixelFormat *format);
enum FixupType {

1
backends/platform/android/android.h
View file

@ -191,7 +191,6 @@ public:
bool setGraphicsMode(int mode, uint flags) override;
int getGraphicsMode() const override;
void updateEventScale(uint32 w, uint32 h);
#ifdef ANDROID_DEBUG_GL_CALLS
bool isRunningInMainThread() { return pthread_self() == _main_thread; }
#endif

7
backends/platform/android/events.cpp
View file

@ -373,13 +373,6 @@ static const Common::KeyCode jkeymap[] = {
Common::KEYCODE_PASTE // AKEYCODE_PASTE
};
void OSystem_Android::updateEventScale(uint32 w, uint32 h) {
if ((h != 0) && (w != 0)) {
_eventScaleY = 100 * 480 / h;
_eventScaleX = 100 * 640 / w;
}
}
void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
int arg4, int arg5, int arg6) {
Common::Event e;