emu-mirror/citra-nightly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,664 Commits 1 Branch 0 Tags 50 MiB
0f44f7b481
Commit Graph

276 Commits

Author SHA1 Message Date
polaris-
5114d75647 Implement gdbstub 2015-09-19 22:28:02 -04:00
Yuri Kunde Schlesner
078969bdd0 CMake: Add option to download Qt and GLFW binaries over HTTP 2015-09-08 19:35:12 -03:00
Yuri Kunde Schlesner
68eb197494 Increase required OpenGL version to 3.3 
This gives us several niceties such as Sampler Objects, shader attribute
locations and Timer Queries.
 2015-08-30 08:45:57 -03:00
Yuri Kunde Schlesner
a1a5570e97 Replace the previous OpenGL loader with a glad-generated 3.3 one 
The main advantage of switching to glad from glLoadGen is that, apart
from being actively maintained, it supports a customizable entrypoint
loader function, which makes it possible to also support OpenGL ES.
 2015-08-30 08:45:56 -03:00
Yuri Kunde Schlesner
0fcabd2b11 Integrate the MicroProfile profiling library 
This brings goodies such as a configurable user interface and
multi-threaded timeline view.
 2015-08-24 22:16:28 -03:00
bunnei
094ae6fadb Shader: Initial implementation of x86_x64 JIT compiler for Pica vertex shaders. 
- Config: Add an option for selecting to use shader JIT or interpreter.
- Qt: Add a menu option for enabling/disabling the shader JIT.
 2015-08-15 18:01:07 -04:00
bunnei
ddbeebb887 Common: Ported over boilerplate x86 JIT code from Dolphin/PPSSPP. 2015-08-15 17:33:45 -04:00
Tony Wasserka
62adb4ee7b Merge pull request #873 from jroweboy/input_array 
Move input values into an array.
 2015-07-28 13:17:12 +02:00
James Rowe
1bc7829ee9 Move input values into an array 2015-07-27 21:41:21 -06:00
Emmanuel Gil Peyrot
168997df46 Citra: Remove dead gpu_refresh_rate option from the default ini file. 2015-07-26 13:16:51 +01:00
Greg Wicks
9930ef72dd Implement new argument parsing using getopt and add the corresponding library to externals 2015-07-12 15:49:23 -04:00
Tony Wasserka
e110e656b9 Merge pull request #910 from linkmauve/install 
Tell CMake to install the compiled binaries on Linux.
 2015-07-12 03:25:53 +02:00
Emmanuel Gil Peyrot
7c51bc44aa Citra, CitraQt: Tell cmake to install the compiled binaries. 
This will help packaging tremendously, as a `make DESTDIR=… install` will now
put every file at their place (on Linux and related).
 2015-07-09 20:19:02 +01:00
Emmanuel Gil Peyrot
79aa1b0808 Citra: Fix the includes a bit, thanks to include-what-you-use. 2015-06-28 00:36:53 +01:00
bunnei
833936fc64 Merge pull request #832 from yuriks/refresh-rate-option 
Remove gpu_refresh_rate configuration option
 2015-05-31 04:48:20 -04:00
Yuri Kunde Schlesner
d65b42a69a Remove gpu_refresh_rate configuration option 
Changing it makes emulation inherently inaccurate. It also had a wrong
default value (30, whereas the real system has a refresh rate of 60 Hz)
which, even if changed, would continue to be used unless people manually
removed it from their config files.
 2015-05-29 19:39:26 -03:00
Emmanuel Gil Peyrot
b1503b2020 Remove every trailing whitespace from the project (but externals). 2015-05-29 21:59:29 +01:00
Emmanuel Gil Peyrot
87d9df89bb Assets: Move citra.ico from src/assets to dist. 2015-05-25 19:00:43 +02:00
tfarley
05dc633a8c OpenGL renderer 2015-05-22 15:51:18 -07:00
tfarley
6d995b1ff6 INI hw/sw renderer toggle 2015-05-22 14:37:55 -07:00
Yuri Kunde Schlesner
b88c91dd3d Common: Remove async logging 
It provided a large increase in complexity of the logging system while
having a negligible performance impact: the usage patterns of the ring
buffer meant that each log contended with the logging thread, causing
it to effectively act as a synchronous extra buffering.

Also removed some broken code related to filtering of subclasses which
was broken since it was introduced. (Which means no one ever used that
feature anyway, since, 8 months later, no one ever complained.)
 2015-05-12 02:31:04 -03:00
Yuri Kunde Schlesner
e1fbac3ca1 Common: Remove common.h 2015-05-07 15:45:22 -03:00
Yuri Kunde Schlesner
bf12f270b3 Common: Remove many unnecessary cross-platform compatibility macros 2015-05-06 23:50:08 -03:00
Zaneo
b8328593fe EmuWindow: Clip mouse input coordinates to emulated screen dimensions. 
If the mouse position for a mouse move/drag would take it outside the emulated screen dimensions, clip the coordinates to
the emulated screen dimensions.
Qt and GLFW will report negative coordinates for mouse positions to the left, or above citra window. Added restriction
to mouse coordinates passed to touchmoved by Qt/GLFW to be greater or equal to zero.
 2015-05-01 23:52:33 -04:00
archshift
cae89fb315 Allow the user to set the background clear color during emulation 
The background color can be seen at the sides of the bottom screen or when the window is wider than normal.
 2015-04-03 15:35:51 -07:00
bunnei
d61b26b79f HID: Complete refactor of pad/touch input to fix threading issues. 2015-03-10 23:58:07 -04:00
bunnei
953e09ddb5 EmuWindow: Made pad/touch functions non-static. 2015-03-10 18:05:20 -04:00
bunnei
dd73217ae3 GLFW: Implemented EmuWindow touchpad support. 2015-03-10 18:05:18 -04:00
bunnei
3da94a597b Merge pull request #634 from linkmauve/logging-performances 
Apply the logging filter before sending the message to the queue
 2015-03-09 15:42:18 -04:00
archshift
539bbd3c59 default_ini.h: Put comments on their own lines 
Apparently inline comments is not necessarily standard in the INI format, and our parser was erroneously parsing the comments as values.
 2015-03-07 17:28:29 -08:00
bunnei
9960c49c21 Set framebuffer layout from EmuWindow. 2015-03-07 17:21:19 -05:00
Emmanuel Gil Peyrot
0aa44e238d Logging: check for filter before sending to the queue, to skip all heavy formatting on the other thread. 2015-03-06 19:23:52 +01:00
Emmanuel Gil Peyrot
aa64f69af0 Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one. 2015-02-22 21:09:08 +01:00
archshift
ef24e72b26 Asserts: break/crash program, fit to style guide; log.h->assert.h 
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time)
As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing)

Also removed some GEKKO cruft.
 2015-02-10 18:30:31 -08:00
bunnei
ca22ee3239 Merge pull request #526 from purpasmart96/citra_stubs 
Services: Stub some functions
 2015-02-10 18:39:37 -05:00
purpasmart96
60ce36f721 Services: Stub some functions 2015-02-07 17:34:59 -08:00
Lioncash
f44781fd7b arm: Adios armemu 2015-01-31 20:43:03 -05:00
archshift
1f109c6b49 Added HID_SPVR service and split HID_U implementation into service/hid/hid.xxx 2015-01-21 13:31:10 -08:00
darkf
67c644e317 Fix building on MinGW 2015-01-11 20:22:08 -08:00
Johannes Ekberg
d7ad14ae20 Use -pthread where and only where needed 
Passing -pthread to GCC as a flag makes it both link to libpthread, and make C standard library routines reentrant. This makes the additional explicit links unnecessary.

Additionally, on OSX, this is the default behavior, and clang will print a message about it being unused if it's present there.
 2015-01-09 15:50:46 +01:00
Johannes Ekberg
7d7ab70279 Generic PLATFORM_LIBRARIES var 
This both reduces redundancy in add_executable definitions, and makes it easier to link additional libraries. In particular, extra libraries are needed on OSX - see next commit.
 2015-01-09 15:50:46 +01:00
Yuri Kunde Schlesner
cdde76f2aa Frontends: Shutdown core when emulation is stopped 2015-01-04 01:04:46 -02:00
bunnei
853b46c681 Core: Change default CPU to dyncom. 2015-01-02 22:33:53 -05:00
Subv
97a7381d29 SOC_U: Preliminary implementation of sockets. 
Stubbed CreateMemoryBlock

Using Berkeley sockets, and Winsock2.2 on Windows.
So far ftpony creates the socket and accepts incoming connections

SOC_U: Renamed functions to maintain consistency

Also prevents possible scope errors / conflicts with the actual Berkeley socket functions

SOCU: Close all the opened sockets when cleaning up SOCU
 2014-12-31 10:51:44 -05:00
Chin
3aeb5970e5 Add citra icon to Windows executable and title bar 2014-12-31 00:38:03 -05:00
darkf
5d10b212ec Fix MSVC-related #defines and add CMakeLists comment 2014-12-29 20:12:03 -08:00
darkf
8ba9ac0f74 Fix merge conflicts 2014-12-29 19:47:41 -08:00
bunnei
3b9d181b8e GPU: Implement frameskip and remove forced framebuffer swap hack. 2014-12-28 22:14:05 -05:00
bunnei
a2005d0657 GPU: Change internal framerate to 30fps. 2014-12-26 21:48:32 -05:00
bunnei
949d95659e Merge pull request #275 from yuriks/cmake-clean 
Clean up CMake library specification
 2014-12-22 11:11:37 -05:00
purpasmart96
ebfd831ccb License change 2014-12-20 21:20:24 -08:00
Yuri Kunde Schlesner
06f31e8b47 Clean up CMake library specification 
The X11 libraries don't need to be specified when doing dynamic linking
 2014-12-15 19:34:17 -02:00
Yuri Kunde Schlesner
0e0a007a25 Add configurable per-class log filtering 2014-12-13 02:08:06 -02:00
Yuri Kunde Schlesner
0600e2d8b5 Convert old logging calls to new logging macros 2014-12-13 02:08:02 -02:00
Yuri Kunde Schlesner
616d874443 New logging system 2014-12-13 01:59:52 -02:00
Rohit Nirmal
8a62423970 Change NULLs to nullptrs. 2014-12-03 12:57:57 -06:00
bunnei
1827bb1fcc Merge pull request #196 from archshift/settings 
Merge Config::ReadXYZs
 2014-11-30 23:17:45 -05:00
Emmanuel Gil Peyrot
648743cf66 GLFW: Add an error callback before calling glfwInit() 
It will print a message to know what happened in case something went wrong in a GLFW call.

Also replace every printf() in the glfw emu-window by ERROR_LOG().
 2014-11-29 23:03:04 +00:00
darkf
459502e48c Fix MinGW build 2014-11-28 21:38:20 -08:00
Emmanuel Gil Peyrot
739bb58c3a Remove tabs in all files except in skyeye imports and in generated GL code 2014-11-19 09:04:03 +00:00
Emmanuel Gil Peyrot
f5d38649c7 Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generated 2014-11-19 09:03:07 +00:00
archshift
06c9712bc7 Merge Config::ReadXYZs 2014-11-18 15:12:49 -08:00
Tony Wasserka
963c923d59 citra GLFW: Ignore minimal window size hints. 
GLFW provides no proper support for this, hence we just allow any window size to be used.
 2014-11-18 13:16:02 +01:00
Tony Wasserka
182476c96a EmuWindow: Remove window title getters/setters. 
The window title is none of the emulation core's business. The GUI code is free to put whatever it wants there.
Providing properly thread-safe window title getters and setters is a mess anyway.
 2014-11-18 13:09:01 +01:00
Tony Wasserka
722ce22589 EmuWindow: Add support for specifying minimal client area sizes. 2014-11-18 13:09:01 +01:00
Tony Wasserka
bd8f491e4c Fixup EmuWindow interface and implementations thereof. 2014-11-18 13:09:01 +01:00
Kevin Hartman
221a9b023d Viewport scaling and display density independence 
The view is scaled to be as large as possible, without changing the aspect, within the bounds of the window.
On "retina" displays, or other displays where window units != pixels, the view should no longer draw incorrectly.
 2014-11-18 13:06:05 +01:00
Tony Wasserka
80e9c02bd6 Merge pull request #159 from SeannyM/enable_log 
Add support for disabling log from settings
 2014-11-15 12:42:08 +01:00
bunnei
3409790668 ARM: Fixed several dyncom bugs. 
- Fixed NZCVT flags to properly save state when function returns.
- Fixed counter to keep track of the actual number of instructions executed.
- Fixed single-step mode to only execute one instruction at a time.
- DefaultIni: Removed comment that no longer applied to dyncom.
 2014-11-11 19:53:19 -05:00
Sean
371b61f3ea Add support for disabling log from settings 2014-11-03 17:00:32 -05:00
bunnei
48f80bb79e Merge pull request #151 from archshift/dyncom-enabled 
Use configuration files to enable or disable the new dyncom interpreter.
 2014-10-27 22:51:10 -04:00
archshift
09e19f9f1e Added gpu_refresh_rate config setting for the new interpreter speed hack. 2014-10-27 19:42:01 -07:00
archshift
0783498f57 Use configuration files to enable or disable the new dyncom interpreter. 2014-10-27 18:35:21 -07:00
Yuri Kunde Schlesner
d72708c1f5 Add override keyword through the code. 
This was automated using `clang-modernize`.
 2014-10-26 16:18:05 -02:00
archshift
a59f57d504 Use config files to store whether SDMC is enabled or not 
Before, it used to use whether the directory actually existed. As a result, .citra-emu/sdmc was never auto-created (something quite confusing to me until I read through the logs).
 2014-10-22 15:24:25 -07:00
archshift
36c04ae2ee emu_window_glfw.cpp: Fixed graceful quitting 
In PR #143, the name of the function IsOpen was originally ShouldClose, but was changed. The function's caller was changed to reflect this, but the return value wasn't.
 2014-10-19 00:53:49 -07:00
archshift
ccb59a9d28 Implemented graceful closing of the GLFW window, along with emulation. 2014-10-17 14:56:17 -07:00
Yuri Kunde Schlesner
ac54cd13db OpenGL renderer: Request a forward compatible context in citra-qt 
This should fix context creation on OS X. Also requests a core context on all platforms in Citra-GLFW, for consistency.
 2014-10-12 14:39:02 +02:00
archshift
e6594f9f53 Added configuration file system. 
Uses QSettings on citra-qt, and inih on citra-cli.
 2014-10-07 15:09:37 -07:00
Kevin Hartman
02fd19b2f6 Added support for multiple input device types for KeyMap and connected Qt. 2014-09-12 01:15:14 -07:00
Kevin Hartman
4a94ec934a Initial HID PAD work, with GLFW only. 2014-09-11 22:43:42 -07:00
Yuri Kunde Schlesner
c57de3e404 Remove hand-crafted Visual Studio solution. 2014-09-01 18:06:30 -03:00
Yuri Kunde Schlesner
45976da975 CMake cleanup 
Several cleanups to the buildsystem:
 - Do better factoring of common libs between platforms.
 - Add support to building on Windows.
 - Remove Qt4 support.
 - Re-sort file lists and add missing headers.
 2014-09-01 18:06:30 -03:00
Yuri Kunde Schlesner
478289140d Replace GLEW with a glLoadGen loader. 
This should fix the GL loading errors that occur in some drivers due to
the use of deprecated functions by GLEW. Side benefits are more accurate
auto-completion (deprecated function and symbols don't exist) and faster
pointer loading (less entrypoints to load). In addition it removes an
external library depency, simplifying the build system a bit and
eliminating one set of binary libraries for Windows.
 2014-09-01 17:41:56 -03:00
bunnei
eb36d3fc90 Core: Refactor core to use only one function for execution. 
Core: Cleaned up comment to be more readable.

Citra: Changed loop to be more readable.
 2014-08-30 23:23:38 -04:00
Tony Wasserka
c4691b784b Pica: Add support for dumping textures. 2014-08-25 22:03:18 +02:00
archshift
80c4d7bf48 Removed unused citra.h 2014-08-19 22:22:12 -07:00
bunnei
7889cafc76 Loader: Implemented AppLoader interface for abstracting application loading. 
- Various cleanups/refactorings to Loader, ELF, and NCCH modules.
- Added AppLoader interface to ELF and NCCH.
- Updated Qt/GLFW frontends to check AppLoader ResultStatus.

NCCH: Removed extra qualification typos.

Loader: Removed unnecessary #include's.

NCCH: Improved readability of memcmp statements.

NCCH: Added missing space.

Elf: Removed unnecessary usage of unique_ptr.

Loader: Removed unnecessary usage of unique_ptr.
 2014-06-24 19:29:58 -04:00
bunnei
0aca202ae9 Loader: Moved elf and loader modules to a "loader" subdirectory. 2014-06-16 18:03:13 -04:00
archshift
ee4717aaae Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-12 06:10:55 -04:00
bunnei
1de7e8cbe4 Merge branch 'master' of https://github.com/bunnei/citra 2014-05-22 22:54:56 -04:00
bunnei
204c6bfeca Merge pull request #2 from archshift/issue-7-fix 
Fixes issues with building Citra on OSX
 2014-05-19 21:46:57 -04:00
archshift
403e4bf837 CMakeLists: rename HEADS, improved comments 
Changes for clarity of comments, removed redundant compiler flags.
 2014-05-19 15:19:36 -07:00
bunnei
9592d61037 Merge pull request #13 from archshift/master 
Use runtime arguments to specify boot filename.
 2014-05-18 22:39:40 -04:00
bunnei
265c770a9d updated how we call ARM core to make things much faster 2014-05-17 11:59:18 -04:00
archshift
bd316ca0c0 Fixed indents 2014-05-04 15:47:42 -07:00
archshift
62528320ea Check arg count before attempting to access it. 2014-05-01 20:41:42 -07:00
archshift
eec40f8f6f Use runtime arguments to specify boot filename. 2014-05-01 15:13:06 -07:00
archshift
704075f04a Fixed indents 2014-04-30 20:13:28 -07:00
archshift
948cfe6d37 Reverse debugging changes 2014-04-30 20:00:44 -07:00
archshift
dade106aa9 Linux support 2014-04-30 18:44:48 -07:00
archshift
fb47258af7 TGA dumps work, courtesy of @bunnei 2014-04-30 18:34:49 -07:00
archshift
c1b770cc0d OpenGL 3+ on OSX with GLFW 2014-04-30 17:00:36 -07:00
archshift
a7f3ed003d A bit of Cmake love 2014-04-30 16:56:47 -07:00
archshift
52377cf0d2 Some more experimentation 2014-04-29 19:27:01 -07:00
archshift
237d079aad Merge commit upstream/master into issue-7-fix 2014-04-28 19:44:43 -07:00
archshift
5a9c2ce5ea IT'S ALIVE! 2014-04-28 19:40:39 -07:00
Thomas Edvalson
a226dc57bf Need to add Xcursor to linker? 2014-04-25 23:01:58 -04:00
Thomas Edvalson
c51e4822b1 Fixed CMake's import of GLFW. 2014-04-25 10:50:25 -04:00
bunnei
7a136b8a84 fixes to build on linux 2014-04-22 19:42:29 -07:00
bunnei
b0ae99e177 removed unused macros from citra.h 2014-04-10 20:04:38 -04:00
bunnei
9527fc74ad fixed a bunch of errors in CMakeLists 2014-04-09 20:28:43 -07:00
bunnei
6b83509a7e updated CMakeLists 2014-04-09 23:09:05 -04:00
bunnei
5da03e821e - removed deprecated version.h 
- cleaned up window title
- cleaned up emu_window_glfw/emu_window
 2014-04-08 23:18:23 -04:00
bunnei
ad4fffca0d fixed license headers in citra project 2014-04-08 20:25:53 -04:00
bunnei
de0a034a84 fixed project includes to use new directory structure 2014-04-08 20:15:08 -04:00
bunnei
63e46abdb8 got rid of 'src' folders in each sub-project 2014-04-08 19:25:03 -04:00
bunnei
f446f79da2 Merge branch 'hardware-interface' 
Conflicts:
	src/core/src/core.h
 2014-04-07 00:57:37 -04:00
bunnei
efef514fd8 removed unused comments, changed main processing loop to be infinite 2014-04-07 00:53:47 -04:00
bunnei
e4d1ad4bda set window size to correspond to framebuffer sizes 2014-04-06 16:55:05 -04:00
bunnei
a604eaee54 added project linker reference 2014-04-06 16:54:28 -04:00
Mathieu Vaillancourt
f1fd84aa0f Support vs express edition without having to get platform sdk 2014-04-04 23:10:02 -04:00
bunnei
c7f4914a90 added simple processing loop and ELF loading to main()... hackish, will cleanup later 2014-03-31 22:25:55 -04:00
ShizZy
e0cb54ea35 moved some core functions over to system module 2013-10-03 17:47:31 -04:00
ShizZy
a79fb90d62 upgraded proj files to vs 2013 2013-09-26 22:48:31 -04:00
ShizZy
8bb0c457bc renamed from citrus to citra 2013-09-26 17:34:48 -04:00