all repos — mgba @ 1fefc26b9195d386273eb55727aef1ea95576ff6

mGBA Game Boy Advance Emulator

Merge branch 'master' into port/psp2
Jeffrey Pfau jeffrey@endrift.com
Sun, 23 Aug 2015 05:08:12 -0700
commit

1fefc26b9195d386273eb55727aef1ea95576ff6

parent

59b9dedea32b229dc217c24fe688437638f025c8

4 files changed, 9 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -4,6 +4,7 @@ - Qt: Windows no longer spawn in the top left on first launch

- Qt: Fix install path of XDG desktop file with DESTDIR - Qt: Fix drag and drop on Windows - Qt: Reenable double buffering, as disabling it broke some Windows configs + - GBA Video: Start on the scanline BIOS finishes on if no BIOS is loaded Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M CMakeLists.txtCMakeLists.txt

@@ -28,6 +28,7 @@ file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)

file(GLOB GBA_CHEATS_SRC ${CMAKE_SOURCE_DIR}/src/gba/cheats/*.c) file(GLOB GBA_RR_SRC ${CMAKE_SOURCE_DIR}/src/gba/rr/*.c) file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c) +file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/gui/*.c) file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs]) file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/util/gui/*.c) file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/*.c)
M src/gba/video.csrc/gba/video.c

@@ -62,7 +62,13 @@ video->vram = 0;

} void GBAVideoReset(struct GBAVideo* video) { - video->vcount = VIDEO_VERTICAL_TOTAL_PIXELS - 1; + if (video->p->memory.fullBios) { + video->vcount = 0; + } else { + // TODO: Verify exact scanline hardware + video->vcount = 0x7E; + } + video->p->memory.io[REG_VCOUNT >> 1] = video->vcount; video->lastHblank = 0; video->nextHblank = VIDEO_HDRAW_LENGTH;