Commit graph

563 commits

Author SHA1 Message Date
inspuration
0c0d35c698 Merge branch 'master' of https://github.com/citra-emu/citra
Conflicts:
	src/video_core/gpu_debugger.h
2014-06-11 15:46:55 -04:00
Tony Wasserka
48419796ba GPU debugger: Const correctness and build fix. 2014-06-11 21:24:35 +02:00
inspuration
69769d4010 Finished primary work on semaphores, implemented mutexing 2014-06-11 14:39:22 -04:00
inspuration
06c041fa79 Merge branch 'master' of https://github.com/citra-emu/citra 2014-06-11 03:56:20 -04:00
inspuration
a2e85c6f95 Merge https://github.com/inspuration/citra 2014-06-11 03:53:32 -04:00
inspuration
7e0ef82f27 Added basic semaphore skeleton code 2014-06-11 03:52:40 -04:00
inspuration
e1e2f0a0ae Updated readme.md to use my travis repo 2014-06-11 01:14:43 -04:00
inspuration
5c4c5f6c52 Fixed problem with qt ui file 2014-06-11 01:05:50 -04:00
inspuration
8e716cdc64 Fixed incorrect slash in header include 2014-06-11 01:00:18 -04:00
inspuration
2b808be027 Additional std::find fixes 2014-06-11 00:54:39 -04:00
inspuration
537c04ac14 Another attempted fix 2014-06-11 00:49:39 -04:00
inspuration
5becefcfd4 Fixed std::find error 2014-06-11 00:44:33 -04:00
inspuration
264335b627 Style tweaks 2014-06-11 00:37:55 -04:00
inspuration
c180fd4003 Fixed minor bug in sharedmem writing 2014-06-11 00:12:54 -04:00
bunnei
0b39535bed VFP: Removed duplicate basic type definitions. 2014-06-10 22:49:11 -04:00
inspuration
5f6fa13af6 Implemented SharedMemory Objects 2014-06-10 21:44:03 -04:00
inspuration
f18ae9892a Finished fixing bugs caused by the merge 2014-06-10 16:29:52 -04:00
inspuration
1d6ea166c1 Merge branch 'master' into threading
Conflicts:
	src/core/core.vcxproj.filters
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
	src/core/hle/service/hid.cpp
	src/core/hle/svc.cpp
2014-06-10 15:17:04 -04:00
inspuration
df6e6a4f60 Merge branch 'threading' of https://github.com/bunnei/citra into threading
Conflicts:
	src/core/hle/function_wrappers.h
2014-06-10 15:10:43 -04:00
inspuration
ad6a99524c Merge remote-tracking branch 'bunnei/master' 2014-06-10 14:59:44 -04:00
bunnei
12845baec6 Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-09 23:01:25 -04:00
bunnei
11d94ea2b3 Common: Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-09 22:54:59 -04:00
bunnei
60185a56fd Event: Updated several log messages to be assertions. 2014-06-09 22:46:54 -04:00
bunnei
06fa90a262 HLE: Moved "PARAM" and "RETURN" macros to function_wrappers.h (this is only module where they are needed). 2014-06-09 22:40:52 -04:00
bunnei
c42e93aaca SVC: Renamed all function wrapper templates to Wrap, moved to HLE namespace. 2014-06-09 22:30:39 -04:00
inspuration
53d6c7a078 Updated gitignore 2014-06-09 22:14:11 -04:00
bunnei
2524c78394 Thread: Renamed occurrences of "t" to "thread" to improve readability. 2014-06-09 22:14:03 -04:00
bunnei
0940335242 Thread: Cleaned up VerifyWait, fixed issue where nullptr msg could unnecessarily be logged. 2014-06-09 22:08:49 -04:00
bunnei
21beafaec0 Merge pull request #15 from archshift/nonosx-fixes
#if's out OSX-specific GL changes on other platforms
2014-06-09 21:59:15 -04:00
bunnei
2e9f13f4eb Common: Removed duplicate "LONG" and "MAX_PATH" definitions. 2014-06-09 20:54:28 -04:00
archshift
1d2ef1253d Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-09 16:51:09 -07:00
inspuration
ff95b7ea24 updated gitignore 2014-06-09 16:29:22 -04:00
inspuration
fc191a3490 Fixed build errors and runtime errors in new gpu debugger menus. 2014-06-09 15:52:51 -04:00
inspuration
85e8edbdd9 Merge branch 'master' of https://github.com/citra-emu/citra
Conflicts:
	src/core/CMakeLists.txt
2014-06-09 14:45:21 -04:00
inspuration
b7be03fd2c Added preliminary support for shared memory objects and handles. 2014-06-09 14:42:01 -04:00
bunnei
95441df10d HLE: Removed usnused EatCycles function. 2014-06-06 23:34:49 -04:00
bunnei
00b0b69b76 SVC: Cleaned up function wrappers to pass in correct argument types. 2014-06-06 23:31:29 -04:00
bunnei
c0fd909258 Thread: Moved position of * in arguments. 2014-06-06 20:05:16 -04:00
bunnei
b05ed89f4a Thread: Updated VerifyWait to be more readable (but functionally the same). 2014-06-06 17:57:52 -04:00
bunnei
3f469e147f SVC: Moved declaration of "wait" variable in SendSyncRequest for improved readability. 2014-06-06 00:44:44 -04:00
bunnei
f922bd14c1 HLE: Updated all uses of NULL to nullptr (to be C++11 compliant) 2014-06-06 00:35:49 -04:00
bunnei
0fc4c88e7f Kernel: Updated various kernel function "name" arguments to be const references. 2014-06-06 00:23:33 -04:00
bunnei
9b59fb0db8 HLE: Updated various handle debug assertions to be more clear. 2014-06-06 00:19:40 -04:00
bunnei
d97b143af9 Mutex: Moved ReleaseMutex iterator declaration to be inside while loop. 2014-06-06 00:13:50 -04:00
bunnei
d472743ec6 Kernel: Updated several member functions to be const 2014-06-06 00:10:50 -04:00
bunnei
bac6ca233c Core: Cleaned up SingleStep(), updated default LCD refresh to assume each instruction is ~3 cycles 2014-06-06 00:06:33 -04:00
bunnei
52735d5513 Core: Changed HW update/thread reschedule to occur more frequently (assume each instruction is ~3 cycles) 2014-06-05 23:32:02 -04:00
bunnei
b31f7293a6 Thread: Fixed bug with ResetThread where cpu_registers[15] was being incorrectly set 2014-06-05 23:19:55 -04:00
bunnei
6fd870e6bb Kernel: Made SyncRequest not pure virtual, with a default implementation of error (as this is not required for all kernel objects) 2014-06-05 23:13:28 -04:00
bunnei
1c867b569d Kernel: Added real support for thread and event blocking
- SVC: Added ExitThread support
- SVC: Added SignalEvent support
- Thread: Added WAITTYPE_EVENT for waiting threads for event signals
- Thread: Added support for blocking on other threads to finish (e.g. Thread::Join)
- Thread: Added debug function for printing current threads ready for execution
- Thread: Removed hack/broken thread ready state code from Kernel::Reschedule
- Mutex: Moved WaitCurrentThread from SVC to Mutex::WaitSynchronization
- Event: Added support for blocking threads on event signalling
2014-06-05 22:35:36 -04:00