citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-29 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
6671 commits 3 branches 2798 tags 74 MiB
Commit graph

5535 commits

Author SHA1 Message Date
James Rowe 26254072e7
Merge pull request #3759 from degasus/TBO_upload 
Rewrite texture_buffer_object handling.
 2018-06-26 09:24:55 -06:00
Weiyi Wang 0a34054a16
Merge pull request #3880 from wwylele/title-fix 
citra_qt: only update title from game after ensuring loaded successfully
 2018-06-26 13:31:36 +03:00
wwylele 458a96bf90 citra_qt: only update title from game after ensuring loaded successfully 2018-06-24 17:30:43 +03:00
Weiyi Wang 689977bbf8
Merge pull request #3876 from NarcolepticK/kernel-migrate-logging 
hle/kernel: Migrate logging macros
 2018-06-24 01:34:22 +03:00
NarcolepticK ed18140daa hle/kernel: Addressed comment about obscure formating 2018-06-23 14:12:54 -04:00
Weiyi Wang fc62da57be
Merge pull request #3877 from tgsm/soc-logging-macro 
Service/SOC: migrate logging macro
 2018-06-23 12:24:53 +03:00
NarcolepticK c2efd49997 service/ldr: Migrate logging macros (#3867) 
* service/ldr: Migrate logging macros

* service/ldr: Fix clang format

* service/ldr: Addressed comment about .c_str() equivalent .data()

* service/ldr: Fix clang format
 2018-06-23 12:24:05 +03:00
tgsm 15442352fd Service/SOC: migrate logging macro 2018-06-22 21:52:29 -04:00
NarcolepticK d433a07b6b hle/kernel: Fix clang format 2018-06-22 19:20:58 -04:00
NarcolepticK a8110cfd3f hle/kernel: Migrate logging macros 2018-06-22 18:54:50 -04:00
NarcolepticK f831a08224 logging: Added NGLOG_GENERIC (needed for vm_manager) 2018-06-22 18:48:25 -04:00
wwylele b06f468049 service/SSL: convert to ServiceFramework 2018-06-22 18:52:24 +03:00
Markus Wick c4ff0ba137 renderer_opengl: Renumber all texture units. 
We spend lots of texture units for our texture buffers. As they are now feed from
one buffer, there is no need to have the big gap in the list of IDs.
 2018-06-22 17:21:28 +02:00
Markus Wick 46f18d6800 gl_shader_gen: Inline now constant texture buffer. 2018-06-22 17:20:55 +02:00
Markus Wick 0838c87dac gl_stream_buffer: Only flush the host buffer if anything was written. 
This might happen in the new TBO upload path.
 2018-06-22 17:20:55 +02:00
Markus Wick 831d4f9aeb gl_rasterizer: Use the shared texture buffer for the proctex lut. 2018-06-22 17:20:55 +02:00
Markus Wick 1ca6d2ea8d gl_rasterizer: Use the shared texture buffer for the noise, color and alpha map. 2018-06-22 17:20:55 +02:00
Markus Wick 63fb7dcc1b gl_rasterizer: Use the shared texture buffer for the fog lut. 2018-06-22 17:20:55 +02:00
Markus Wick 4679487640 gl_rasterizer: Use the shared texture buffer for the lighting lut. 2018-06-22 17:20:54 +02:00
Markus Wick 5a9cde138d gl_rasterizer: Add a new dirty flag for any lighting lut. 2018-06-22 17:17:48 +02:00
Markus Wick a8396cdbed renderer_opengl: Create shared texture buffer. 2018-06-22 17:05:40 +02:00
Markus Wick 298ebe3752 gl_rasterizer: Inline texture buffer uploads. 2018-06-22 17:04:47 +02:00
Markus Wick 8a8c6f059f gl_rasterizer: Move TBO syncing helper to one function. 2018-06-22 17:04:47 +02:00
Markus Wick 10fba63b94 gl_rasterizer: Provide texture buffer offsets. 
This allows us to move all data into one TBO.
 2018-06-22 17:03:38 +02:00
Weiyi Wang f50e505a5a
Merge pull request #3778 from wwylele/shadow-hw-image-load-store 
gl_rasterizer: implement shadow map 2D/Cube - Image load/store version
 2018-06-22 17:47:09 +03:00
Weiyi Wang 7b38bde95b
Merge pull request #3872 from NarcolepticK/applets-migrate-logging 
applets: Migrate logging macros
 2018-06-22 17:35:26 +03:00
wwylele 7471373058 Service/NWM: convert to ServiceFramwework 2018-06-22 17:14:23 +03:00
Weiyi Wang 64adf94ef2
Merge pull request #3871 from NarcolepticK/nwm-migrate-logging 
service/nwm: Migrate logging macros
 2018-06-22 16:21:34 +03:00
Weiyi Wang ed8f69614d
Merge pull request #3870 from NarcolepticK/dlp-migrate-logging 
service/dlp: Migrate logging macro
 2018-06-22 15:27:39 +03:00
Weiyi Wang e4b5b9daab
Merge pull request #3869 from NarcolepticK/news-migrate-logging 
service/news: Migrate logging macro
 2018-06-22 15:27:26 +03:00
Weiyi Wang 53ad300144
Merge pull request #3868 from NarcolepticK/ptm-migrate-logging 
service/ptm: Migrate logging macros
 2018-06-22 13:33:46 +03:00
NarcolepticK a42287587e service/fs: Migrate logging macros (#3866) 
* service/fs: Migrate logging macros

* service/fs: Fix clang format
 2018-06-22 13:33:30 +03:00
Weiyi Wang 1449f8e725
Merge pull request #3865 from NarcolepticK/applet_manager-migrate-logging 
service/apt/applet_manager: Migrate logging macros
 2018-06-22 13:33:12 +03:00
Weiyi Wang 199710f346
Merge pull request #3864 from NarcolepticK/am-migrate-logging 
service/am: Migrate logging macros
 2018-06-22 13:33:00 +03:00
Weiyi Wang ad4a943c7a
Merge pull request #3861 from NarcolepticK/y2r-migrate-logging 
service/y2r: Migrate logging macros
 2018-06-22 11:48:01 +03:00
Weiyi Wang c3466f38d7
Merge pull request #3860 from NarcolepticK/service-migrate-logging 
service/service: Migrate logging macros
 2018-06-22 11:47:49 +03:00
Weiyi Wang 274859b8ef
Merge pull request #3859 from NarcolepticK/sm-migrate-logging 
service/sm: Migrate logging macros
 2018-06-22 11:47:34 +03:00
NarcolepticK 584e7d71e2 service/ns: Migrate logging macros (#3857) 
* service/ns: Migrate logging macros

* service/ns: Addressed comment about PRIx64

* service/ns: Missed 'x' in format when removing PRIx64
 2018-06-22 11:47:02 +03:00
NarcolepticK 2d94c25265 service/cfg: Migrate logging macros (#3853) 
* service/cfg: Migrate logging macros

* service/cfg: Fix clang format

* service/cfg: Addressed comment about char cast

* service/cfg: Changed to static_cast<char>
 2018-06-22 11:46:22 +03:00
NarcolepticK 958d39a76f applets: Migrate logging macros 2018-06-22 04:24:54 -04:00
NarcolepticK 42b32ac1ea service/nwm: Migrate logging macros 2018-06-22 04:16:38 -04:00
NarcolepticK 3b712321b4 service/dlp: Migrate logging macro 2018-06-22 03:57:23 -04:00
NarcolepticK bd368d6921 service/news: Migrate logging macro 2018-06-22 03:55:18 -04:00
NarcolepticK db256c69a4 service/ptm: Migrate logging macros 2018-06-22 03:47:18 -04:00
NarcolepticK 428ae40728 service/apt/applet_manager: Migrate logging macros 2018-06-21 22:43:27 -04:00
NarcolepticK ccfa92a14f service/am: Migrate logging macros 2018-06-21 22:34:26 -04:00
NarcolepticK 4c67f1c7c6 service/nim: Migrate logging macros (#3856) 2018-06-21 12:20:10 +03:00
NarcolepticK 4666d0c958 service/nfc: Migrate logging macros (#3855) 2018-06-21 12:19:44 +03:00
NarcolepticK 394b626e51 service/mic: Migrate logging macros (#3854) 2018-06-21 12:19:10 +03:00
NarcolepticK a955385ec0 service/gsp: Migrate logging macros (#3852) 
* service/gsp: Migrate logging macros

* service/gsp: Fix clang format
 2018-06-21 12:16:10 +03:00
NarcolepticK 831e3a0b54 service/err_f: Migrate logging macros (#3849) 
* service/err_f: Migrate logging macros

* service/err_f: Added static_cast<u32>
 2018-06-21 12:14:59 +03:00
NarcolepticK 0525b27b19 service/y2r: Fix clang format 2018-06-21 01:28:47 -04:00
NarcolepticK 9bd4fb2f53 service/y2r: Migrate logging macros 2018-06-21 01:14:27 -04:00
NarcolepticK fcf42bbe8a service/service: Migrate logging macros 2018-06-21 00:37:06 -04:00
NarcolepticK b10d2badd0 service/sm: Migrate logging macros 2018-06-20 23:59:58 -04:00
wwylele 2f9b7bdfa9 gl_shader_gen: lower log level of using disabled proctex 2018-06-20 18:34:01 +03:00
NarcolepticK 964602dfcb service/cam: Migrate logging macros (#3848) 
* service/cam: Migrate logging macros

* service/cam: Fix clang format

* service/cam: Missed one clang format fixup
 2018-06-20 13:39:05 +03:00
Weiyi Wang b2cbf2403f
Merge pull request #3820 from daniellimws/core-macros-1 
core: Replace logging macros
 2018-06-20 13:36:48 +03:00
Weiyi Wang 3938e6c592
Merge pull request #3847 from NarcolepticK/ir-migrate-logging 
service/ir: Migrate logging macros
 2018-06-20 13:34:52 +03:00
Weiyi Wang 2d98b2e77a
Merge pull request #3845 from NarcolepticK/hid-migrate-logging 
service/hid: Migrate logging macros
 2018-06-20 13:34:41 +03:00
Weiyi Wang 9ef9e6c48e
Merge pull request #3844 from NarcolepticK/frd-migrate-logging 
service/frd: Migrate logging macros
 2018-06-20 13:34:32 +03:00
Weiyi Wang 0ed4d575f4
Merge pull request #3843 from NarcolepticK/csnd-migrate-logging 
service/csnd_snd: Migrate logging macros
 2018-06-20 13:34:15 +03:00
NarcolepticK 8c08678606 service/ir: Migrate logging macros 2018-06-20 01:09:50 -04:00
James Rowe fa5d247b43
Merge pull request #3846 from zhaowenlan1779/clang 
service/ac: fix clang format
 2018-06-19 19:44:23 -06:00
zhupengfei 7b4738ad33
service/ac: fix clang format 2018-06-20 09:42:39 +08:00
zhupengfei fa80ba9846
citra-qt: Improve Title Bar display 2018-06-20 09:30:29 +08:00
zhupengfei ddc97b15f4 common: Parse Nightly/Canary build version 2018-06-20 09:30:26 +08:00
NarcolepticK ad70214dbf service/hid: Migrate logging macros 2018-06-19 19:52:03 -04:00
NarcolepticK 705eb597c8 service/frd: Migrate logging macros 2018-06-19 19:46:12 -04:00
NarcolepticK a7a3718fce service/csnd_snd: Migrate logging macros 2018-06-19 19:30:59 -04:00
NarcolepticK c9737ff16c service/cecd: Migrate logging macros 2018-06-19 15:07:17 -04:00
James Rowe e27bb6394d
Merge pull request #3837 from zhaowenlan1779/aboutdialog-builddate 
citra-qt: Add build date in about dialog
 2018-06-19 11:57:40 -06:00
NarcolepticK f410974644 AC Migrate Logging Macros (#3838) 
* service/ac: Migrate logging macros

* service/ac: Added 0x on hex

* service/ac: Changed lowercase x to uppercase X
 2018-06-19 11:54:59 -06:00
zhupengfei 6c4f3257b7
citra-qt: Add build date in about dialog 2018-06-18 21:21:00 +08:00
James Rowe 574824a26c
Merge pull request #3632 from N00byKing/3dtv_botenable 
Add Support for Stereoscopic 3D
 2018-06-17 21:05:15 -06:00
James Rowe c39dee1569
Merge pull request #3617 from BreadFish64/multiple-game-dirs 
QT: Add support for multiple game directories
 2018-06-17 21:04:24 -06:00
N00byKing 74367203cf emu_window: Adapt Touchscreen to 3D Settings 2018-06-17 14:00:47 +02:00
James d184a3a1ee Update cpp-httplib for gzip + chunked encoding fixes 2018-06-14 16:00:07 +10:00
Daniel Lim Wee Soong f0ea96f144
Merge branch 'master' into core-macros-1 2018-06-11 22:30:21 +08:00
James Rowe cf9bfe0690
Merge pull request #3787 from wwylele/shader-jit-state 
shader/jit: preserve integer & condition register across invocation
 2018-06-09 18:38:05 -06:00
James Rowe 2dac1a9590
Merge pull request #3788 from wwylele/shader-jit-breakc 
shader/jit: implement breakc
 2018-06-09 18:36:46 -06:00
James Rowe 6811eda2b9
Merge pull request #3764 from zhaowenlan1779/camera-flip 
camera: camera refinement
 2018-06-09 14:02:50 -06:00
James Rowe a5cf5b56bd
Merge pull request #3826 from Steveice10/master 
boss: Return buff_size in parameter 2 of ReceiveProperty.
 2018-06-09 13:34:03 -06:00
James Rowe ad81bca8dd
Merge pull request #3819 from zhaowenlan1779/game-list-refix 
game_list: fix system title display
 2018-06-09 13:32:28 -06:00
Daniel Lim Wee Soong 4d2cbf271c Fix wrongly replaced arguments 2018-06-09 16:35:37 +08:00
Steveice10 e24fb768e3 boss: Return buff_size in parameter 2 of ReceiveProperty. 2018-06-08 18:12:35 -07:00
Daniel Lim Wee Soong ac4d85ca16 core/telemetry_session: Replace logging macros 2018-06-07 23:07:33 +08:00
Daniel Lim Wee Soong e633d744eb core/memory: Replace logging macros 2018-06-07 23:07:15 +08:00
Daniel Lim Wee Soong 2865d23064 core/frontend: Replace logging macros 2018-06-07 23:07:02 +08:00
Daniel Lim Wee Soong d81cacfb9e core/file_sys: Replace logging macros 2018-06-07 23:06:44 +08:00
Daniel Lim Wee Soong bef6c6d174 core/core_timing: Replace logging macros 2018-06-07 23:06:26 +08:00
Daniel Lim Wee Soong f407917eb7 core/core: Replace logging macros 2018-06-07 23:06:03 +08:00
zhupengfei cb52033133
game_list: fix system title display 2018-06-07 18:50:35 +08:00
zhupengfei 3c554153c7
StillImageCamera: fix multiple prompt 2018-06-07 14:57:07 +08:00
zhupengfei a15e4e80c6
QtMultimediaCamera: fix invalid settings 2018-06-07 14:57:07 +08:00
zhupengfei 7c48160beb
StillImageCamera: move GetFilePath to UI thread 2018-06-07 14:57:06 +08:00
zhupengfei 341c07156a
camera: Single/Double (QtMultimediaCamera) 2018-06-07 14:57:05 +08:00
zhupengfei 3cb91338e9
camera: migrate logging macros 2018-06-07 14:57:05 +08:00
zhupengfei 6e410dcef5
camera: refactor (add qt_camera_base) 2018-06-07 14:57:04 +08:00
zhupengfei 5ebd466869
camera: Add camera flip config 2018-06-07 14:57:03 +08:00
MerryMage b8c5007153 arm_dyncom_interpreter: Clear exclusive memory state after SVC call 2018-06-03 21:06:57 +01:00
wwylele b611b2934f UDS: fix RecvBeaconBroadcastData response header 2018-06-02 00:38:54 +03:00
N00byKing 523c52c708 renderer_opengl: Add Universal 3D Layout Adaption 2018-06-01 18:24:26 +02:00
jmorriz124 8c0ede544f 3dtv botenable improved (#1) 
* Fixed crash when right eye isn't available

* Enabled swap screens in stereo views.  Fixed window alignment in stereo
views to handle all screen aspect ratios.

* Minor code cleanup and clang fomat updates.

* Minor cleanup of swapped and aspect ratio code
 2018-06-01 17:05:29 +02:00
N00byKing d27312b816 shared_page: Remove Get3DSliderstate 2018-06-01 17:05:29 +02:00
N00byKing 594e95084b shared_page: Set 3D Slider 2018-06-01 17:05:09 +02:00
N00byKing f4894d5677 shared_page: Allow Setting the 3D Slider 
Currently, changing the Option while the Game is running does not work
 2018-06-01 17:05:02 +02:00
N00byKing 2814bbc3da renderer_opengl: Allow usage of Stereoscopic 3D 2018-06-01 17:01:06 +02:00
N00byKing e4788130e5 citra, citra_qt, settings.h: Add Options for Stereoscopic 3D 2018-06-01 17:01:00 +02:00
wwylele 781912e854 gl_rasterize: implement shadow mapping using image load/store 2018-06-01 14:26:44 +03:00
Weiyi Wang 08b119153d
Merge pull request #3799 from wwylele/sigh 
gl_rasterizer: reset texture state context after every draw
 2018-06-01 14:24:28 +03:00
wwylele 9060e08e49 shader/jit: implement breakc 2018-06-01 13:04:39 +03:00
wwylele f0ee4c0595 gl_rasterizer: reset texture state context after every draw 2018-06-01 12:05:30 +03:00
James Rowe 7715fd2c19
Merge pull request #3750 from wwylele/cube-watcher-fix 
gl_rasterizer_cache: add missing watcher invalidation
 2018-05-31 23:11:39 -06:00
James Rowe f7f5a54bc3
Merge pull request #3751 from wwylele/shader-warning-shutup 
gl_shader_gen: rearrange function definition to avoid suprious warnings
 2018-05-31 23:10:42 -06:00
James Rowe 87d2866127
Merge pull request #3757 from zhaowenlan1779/game-list-fix 
citra_qt: Improve Game List Item display
 2018-05-31 23:10:02 -06:00
James Rowe 489d5a3da9
Merge pull request #3769 from Kloen/dark-theme-updates 
citra-qt: Update Dark theme to latest version
 2018-05-31 22:45:54 -06:00
James Rowe 174241ff90
Merge pull request #3800 from liushuyu/master 
citra: correct regex for matching nickname
 2018-05-31 22:14:39 -06:00
James Rowe 04a9145dfc
Merge pull request #3776 from darkf/cubeb-sink2 
Implement a Cubeb audio sink
 2018-05-31 22:13:12 -06:00
darkf 04139e26bd cubeb_sink: Skip devices without a name 
Previously this would crash.
 2018-05-31 21:01:48 -05:00
darkf ce6d9e2e28 externals: Don't build cubeb with tests 2018-05-31 21:01:48 -05:00
darkf 35c43aa293 audio_core: Only include cubeb if it's available 2018-05-31 21:01:48 -05:00
darkf af73dd45f0 audio_core: Implement a cubeb audio sink 2018-05-31 21:01:48 -05:00
liushuyu c0f352bc4e
citra: correct regex for matching nickname 2018-05-31 19:38:12 -06:00
James Rowe 72f9142bb1
Merge pull request #3746 from wwylele/ndm-new-framework 
Service/NDM: convert to ServiceFramework
 2018-05-29 23:54:21 -06:00
James Rowe e63c374ff0
Merge pull request #3714 from wwylele/primitive-restart-guard 
video_core/command_processor: correctly handles 0xFFFF index as a normal index
 2018-05-29 23:22:00 -06:00
James Rowe aa95604928
Merge pull request #3652 from N00byKing/3dtv_crashfix 
gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff
 2018-05-29 22:43:52 -06:00
Valentin Vanelslande 90bcb26c3b citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys 2018-05-28 16:36:56 -05:00
Markus Wick caba02d42a gl_rasterizer: Don't flip the texture bindings. 
The state object isn't used anywhere else, so there
is no need to revert the state.
And the comment is just wrong: It doesn't matter
which textures are bound on framebuffer binding, it
only matters at draw time. And we reset all bindings
before the draw call. So let's use gl_state as it is
designed to avoid flipping states.
 2018-05-28 21:04:59 +02:00
wwylele 874cb42e70 shader/jit: preserve integer & condition register across invocation 2018-05-28 14:41:47 +03:00
wwylele 549abe556b Service/NDM: convert to ServiceFramework 2018-05-28 11:28:13 +03:00
BreadFish64 30c6c37d6c fix jrowes lazy sorting 2018-05-26 15:38:06 -05:00
BreadFish64 31a9fdb00b fix preffered game 2018-05-26 15:38:06 -05:00
BreadFish64 1a57f9488f citra_qt: support multiple game directories 2018-05-26 15:38:06 -05:00
Nico Bosshard 88ebd844e5 Add search filter support for multiple game directories 2018-05-26 15:38:05 -05:00
Weiyi Wang 09982c3386
Merge pull request #3732 from ccawley2011/fix-arm 
Fix compilation on ARM
 2018-05-26 20:14:55 +03:00
zhupengfei 9504aa19d5
game_list: rewrite format 2018-05-26 22:27:59 +08:00
Weiyi Wang ba4a0525bf
Merge pull request #3724 from degasus/scissor 
gl_rasterizer: Remove redundant scissor state change.
 2018-05-25 20:35:41 +03:00
Logan B b5934237fa
Fix build 2018-05-25 20:28:15 +12:00
zhupengfei e5c8b9f0a2
game_list: append filename after program ID 2018-05-23 21:36:10 +08:00
Kloen 15e2be85b5 citra-qt: Change link colors to a more readable one when using the dark theme 2018-05-23 02:51:19 +02:00
James 29551c187a Add missing std::string import in text_formatter 2018-05-19 21:31:09 +10:00
zhupengfei 3b18faa163
citra_qt: Improve Game List Item display 2018-05-19 17:21:26 +08:00
Christoph 3bf924cd20 Camera translation (#3747) 
* citra_qt: correct spelling in configuration

* citra_qt/camera: Changed the order of the translation

The translation may not correspond to "couln't load" and "the camera", so create two cases which can get translated individually.
Also add a space after "the camera".

* citra_qt/camera: use the same syntax for the filter in "still_image_camera.cpp" as in "configure_camera.cpp"

* citra_qt/camera: the config should only get added if it's not empty
 2018-05-19 12:03:06 +03:00
wwylele 92a1252835 gl_shader_gen: rearrange function definition to avoid suprious warnings 2018-05-19 00:36:33 +03:00
wwylele 8b4e832c5f gl_rasterizer_cache: add missing watcher invalidation 2018-05-18 23:58:43 +03:00
Markus Wick 8e1e52cad9 gl_rasterizer_cache: Use clean state for glBlitFramebuffer. 
Framebuffer blits depends on pixel tests:
Ownership (is fine)
Scissor (is broken on the last commit)
Masking (is broken on master for a while)

So let's be honest and start with a clean state in
those helper functions.
 2018-05-18 21:13:56 +02:00
Markus Wick 301073334a gl_rasterizer: Remove redundant scissor state change. 
There is no need to disable this state after the draw call,
gl_state will handle this for us if needed. This kind of
redundant state changes are bad for the driver overhead,
as flipping bits will invalidate the driver state.
 2018-05-18 21:13:56 +02:00
James Rowe e35c634fc6
Merge pull request #3742 from wwylele/glvtx-ui 
citra-qt: add gpu shader emulation related configurations
 2018-05-18 13:04:18 -06:00
James Rowe 64a8c8ee07
Merge pull request #3741 from wwylele/glvtx-last 
gl_rasterizer: implement AccelerateDrawBatch to emulate PICA shader on hardware
 2018-05-18 13:03:40 -06:00
wwylele 4377caf1df citra-qt: add tooltips for renderer options 2018-05-18 15:15:07 +03:00
wwylele 129b893509 gl_stream_buffer: update the information about the AMD hack 2018-05-18 14:08:12 +03:00
wwylele dd6252a676 gl_rasterizer: fallback to software shader path if buffer overflow happens on hardware shader path 2018-05-18 13:55:19 +03:00
Daniel Lim Wee Soong 7861be67bb core/arm/skyeye_common: Migrate logging macros (#3684) 
* core/arm/skyeye_common: Migrate logging macros

Use the new logging macros NGLOG

* Replace specifiers that were missed out

* Replace printf with NGLOG

* skyeye_common: fix NGLOG without log class
 2018-05-14 11:22:32 +03:00
wwylele 6985b13439 [HACK] AMD workaround 2018-05-14 10:17:36 +03:00
wwylele ede0d15fec video_core/command_processor: attempt accelerate draw in draw trigger 2018-05-14 10:17:36 +03:00
wwylele 9b448a0739 gl_rasterizer: implement AccelerateDrawBatch to emulate PICA shader on hardware 2018-05-14 10:17:36 +03:00
MerryMage 15d14be3cc primitive_assembly: Add getters for internal state 2018-05-14 10:17:35 +03:00
wwylele 06815ec905 video_core: receive hardware shader settings 2018-05-14 10:17:35 +03:00
wwylele f1cc8cfea9 citra,citra_qt: load/save hardware shader settings 2018-05-14 10:17:35 +03:00
Cameron Cawley 101d8964f1 common: Fix compilation on ARM 2018-05-13 11:34:45 +01:00
wwylele 1d5a26b1d8 citra-qt: add gpu shader emulation related configurations 2018-05-13 10:58:20 +03:00
wwylele b31ed30fb2 settings: add hardware shader related settings 2018-05-13 10:57:55 +03:00
wwylele 97f9cfac70 settings: add hardware shader related settings 2018-05-13 10:44:47 +03:00
James Rowe 80bfd87270
Merge pull request #3730 from FearlessTobi/game-compat-fixes 
citra_qt: Refactor game list compatibility system
 2018-05-11 11:59:53 -06:00
朱鹏飞 57827de38b citra_qt: camera integration (#3566) 
* Implement camera feature

* Make OpenCVCamera optional

* Fix styling problems

* CI configuration

* Fix CI

* Hopefully final fix

* Hopefully final fix

* Fix all the problems

* Oops..

* Add Qt Multimedia Camera

* Another oops

* Try to fix broken linux CI

* Try to fix broken linux CI

* Fix problems

* Improve UI

* Fix problems

* camera: Add support for Qt <5.10 and fix preview error

* CI: try to fix linux-frozen travis build

* camera: fix problems and add multiple handlers support

* fix CI

* remove most ServiceFramework changes

* Fix format

* Remove last ServiceFramework change

* camera: remove unused interfaces; revert submodule change

* camera: fix CI error

* ci: use ccache for opencv build

* citra_qt: fix configuration error; CI: add mediaservice plugin

* citra_qt: fix clang-format

* citra_qt: fix documentation error

* citra_qt: fix configuration page; camera: fix pausing crash

* citra_qt: fix preview not stopping

* camera: extend handlers length

* camera: fix camera resume error

* camera: fix clang-format

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* CI: fix linux ci

* camera: check settings update; citra_qt: fix configuration error

* service_cam: use a better way to apply configuration

* Service_CAM: rewrite camera reload

* cam: fix clang format

* citra_qt: fix argument load issue; camera: base of system camera selection

* citra_qt: Add system camera selection

* camera: fix image upside down, Implement SetFrameRate in Qt Multimedia Camera

* camera: Add missing <array> include, update SetFrameRate and add settings in Qt Multimedia Camera header

* camera: move started in Qt Multimedia Camera header

* QtMultimediaCamera: Move frame rates to SetFrameRate; Set minimum and maximum frame rate

* Update appveyor.yml
 2018-05-11 11:42:23 -06:00
FearlessTobi f354744ad4 citra_qt: Refactor game list compatibilty 2018-05-10 03:57:57 +02:00
wwylele 68b0a3e19e regs_pipeline: use proper unsigned type where applicable 2018-05-06 15:57:48 +03:00
Weiyi Wang f85e71c37c
Merge pull request #3715 from wwylele/hardware-vertex-vector 
gl_rasterizer: Use GLvec* instead of C arrays
 2018-05-06 07:19:06 +03:00
Weiyi Wang 79ac4766b4
Merge pull request #3668 from daniellimws/gdbstub-macros 
core/gdbstub: Migrate logging macros
 2018-05-05 16:48:52 +03:00
Valentin Vanelslande 473fd552c8 Service/AM: Implement GetProductCode (#3549) 
* [skip ci]

* [skip ci]

* [skip ci]

* [skip ci]

* Service/AM: Implement GetProductCode

* fix?

* remove close

* Use PushRaw

* Use NCCHContainer

* 2 if found

* struct

* fix build?

* fix

* remove return

* fix?

* 6 words
 2018-05-05 16:43:31 +03:00
Weiyi Wang 0da3b75c9e
Merge pull request #3700 from wwylele/texcache-watcher 
gl_rasterizer_cache: cache texture cube
 2018-05-05 16:30:39 +03:00
Markus Wick 5960282303 gl_rasterizer: Use buffer_storage for uniform data. 
This replaces the glBufferData logic with the shared stream buffer code.
The new code doesn't need a temporary staging buffer any more, so the
performance should imrpove quite a bit.
 2018-05-05 09:22:02 +02:00
MerryMage d6cd1a8712 gl_rasterizer: Use GLvec* instead of C arrays 2018-05-05 04:37:04 +03:00
wwylele 08a38370b0 video_core/command_processor: correctly handles 0xFFFF index as a normal index 2018-05-05 04:24:31 +03:00
James Rowe ca01c7eea8
Merge pull request #3665 from adityaruplaha/log-version 
frontend: Log Citra version.
 2018-05-03 15:17:04 -06:00
James Rowe ca3b82caa4
Merge pull request #3705 from zhaowenlan1779/multiplayer-fix 
citra_qt: multiplayer password dialog fix
 2018-05-02 09:17:33 -06:00
Mat M a5f906b8ab
Merge pull request #3708 from FearlessTobi/add-region-column 
citra_qt: Add a game region column to the Game List
 2018-05-02 00:22:38 -04:00
Weiyi Wang be5777f3de
Merge pull request #3686 from wwylele/glvtx-shader-gen 
gl_shader_gen: generate programmable vs/gs and fixed gs
 2018-05-01 21:27:48 +03:00
wwylele 1762ad2dcc gl_rasterizer_cache: cache texture cube 2018-05-01 21:26:43 +03:00
FearlessTobi 36c4765054 citra_qt: Add a game region column 2018-05-01 19:57:01 +02:00
zhupengfei b33f7901b6
citra_qt: fix clang-format 2018-05-01 11:26:57 +08:00
zhupengfei 784c41bf34
citra_qt: multiplayer password dialog fix 2018-05-01 11:15:31 +08:00
adityaruplaha 0cece7918a Log Citra version. 
Class: Frontend
Level: Info
Format: "Citra Version: " + window title
 2018-04-29 21:05:19 +05:30
Weiyi Wang 9c65a45358
Merge pull request #3694 from jroweboy/quickfix 
Fix duplicated logs on windows
 2018-04-28 10:31:25 +03:00
James Rowe 252e5f173d
Merge pull request #3676 from jroweboy/minor-mp-ui-fix 
Minor multiplayer ui fixes
 2018-04-27 10:00:21 -06:00
James Rowe 98c150e7fc Fix duplicated logs on windows 2018-04-27 09:58:48 -06:00
James Rowe 1b94f25e6c
Merge pull request #3568 from daniellimws/logging-backends 
Logging: Add customizable backends
 2018-04-26 21:09:31 -06:00
James Rowe 65b38a7537 fixup: Address review 2018-04-25 10:31:51 -06:00
James Rowe 6ce111301f Frontend: Add missing translation for network error messages 2018-04-25 09:44:16 -06:00
bunnei ed42b4b0d2
Merge pull request #3678 from wwylele/b15-fallback 
gl_shader_decompiler: fallback to CPU shader on GS b15 access
 2018-04-25 00:03:11 -04:00
bunnei b003e1398a
Merge pull request #3666 from degasus/vertex_streaming 
renderer_opengl: Rewrite stream buffer.
 2018-04-24 23:58:41 -04:00
wwylele 191b29e402 gl_shader_gen: generate programmable vs/gs and fixed gs 2018-04-24 20:39:10 +03:00
Daniel Lim Wee Soong 51398e0301 Logging: Add customizable logging backends and fmtlib based macros 
* Change the logging backend to support multiple sinks through the
Backend Interface
* Add a new set of logging macros to use fmtlib instead.
* Qt: Compile as GUI application on windows to make the console hidden by
default. Add filter configuration and a button to open log location.
* SDL: Migrate to the new logging macros
 2018-04-23 21:32:56 -06:00
MerryMage 8186820d16 pica_to_gl: Add GLuvec{2,3,4} aliases 
To allow for transfer for integers into shaders.
 2018-04-23 20:21:24 +03:00
wwylele e56128683c gl_shader_decompiler: fallback to CPU shader on GS b15 access 2018-04-23 12:45:56 +03:00
Adityarup Laha c06d6ecea2
Replace "Hide Full Games" with "Hide Full Rooms" 2018-04-22 16:56:49 +05:30
Markus Wick c4010e3f93 renderer_opengl: Drop GLSync, unused. 2018-04-21 16:12:30 +02:00
Markus Wick 5d1dd205c4 renderer_opengl: Rewrite stream buffer. 2018-04-21 16:12:30 +02:00
James Rowe c7726f13e8 Frontend: Prevent a crash from closing a hosted room using the Disconnect button and then trying to host another room 2018-04-20 00:53:56 -06:00
James Rowe 5fef22fc52 Frontend: Prevent connecting to another room when already joining 2018-04-20 00:53:31 -06:00
James Rowe d35693bbbc More minor issue fixes 
* Move Joining state change sooner in the code to prevent an issue where
failing to connect multiple times in a row doesn't change the state (as
it goes from CouldNotConnect -> CouldNotConnect which doesn't trigger a
state changed callback)
* Prevent double clicking too fast on a room in the lobby from causing
issues
* Lobby no longer closes when joining a room
 2018-04-19 10:28:19 -06:00
James Rowe 62257e0d79 Fix Lobby filtering with player list 
* Make double clicking the player list open the correct room
* Fix an issue where filtering with search broke the whos playing list
 2018-04-19 10:28:18 -06:00
James Rowe 1f6791431d Move almost all state change tracking to MultiplayerState 
Each window can still watch for state changes to update the ui or to
close the window as appropriate, but for any error announcements, they
all belong in Multiplayer state now.
 2018-04-19 10:28:18 -06:00
James Rowe a5c8e07f46 Remove duplicated logic in HostRoom 
Fixes some issues with multiple warning messages
 2018-04-19 10:28:18 -06:00
James Rowe 2be02f221d Fix player list not showing in lobby. Fix host and direct connect crashing citra 2018-04-19 10:28:18 -06:00
James Rowe 01b49b7e78 Fix compilation issue where unique_ptr needs full class declaration 2018-04-19 10:28:17 -06:00
James Rowe c635c7f40d Address more review comments 
* Make Validation a singleton instead
* Wording changes for error messages
* Smart pointers for Ui members
* Other minor nitpicks
 2018-04-19 10:28:17 -06:00
James Rowe a85511cd7d Fix multiplayer dropdowns and proxy model 
* Filters in the lobby properly remove rooms
* Multiplayer menu items for Show Room and Leave Room work as intended
 2018-04-19 10:28:17 -06:00
James Rowe 601fd81d5c Address review comments 2018-04-19 10:28:16 -06:00
James Rowe 3be7aa2cfc Moved the password icon to the room name. 
Also added a dark mode lock icon as well (and fixed a small bug
preventing the lock icon from showing up)
 2018-04-19 10:28:16 -06:00
James Rowe aa391ed60d Fixed and issue where multiplayer state was covering the File and Emulation menu items when it shouldn't even be visible 2018-04-19 10:28:16 -06:00
James Rowe 599eebf511 Remove the current players blurb 2018-04-19 10:28:16 -06:00
James Rowe 2d1efcc36b Add a member list expandable to the lobby. Fix issue with hosting more than once. 2018-04-19 10:28:15 -06:00
James Rowe f346a9d372 Split multiplayer code into its own class 2018-04-19 10:28:15 -06:00
James Rowe ddbbab8fd6 Add network status text to the status bar 2018-04-19 10:28:15 -06:00
James Rowe 871196bc10 Citra-qt: Add multiplayer ui 2018-04-19 10:28:14 -06:00
Weiyi Wang bba2a60b22
Merge pull request #3670 from jbeich/qt 
Unbreak build with Qt 5.9.4 (at least on FreeBSD)
 2018-04-19 18:02:35 +03:00
Weiyi Wang 977abd2c7a
Merge pull request #3607 from adityaruplaha/sdl2-fullscreen 
SDL2: Implement fullscreen
 2018-04-19 16:16:37 +03:00
Jan Beich 394638e9c9 Qt: Add missing #include after 2f8bd18296 
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~
                QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: incomplete type 'QApplication' named in nested name specifier
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~
                   QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: incomplete type 'QApplication' named in nested name specifier
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
 2018-04-18 20:03:52 +00:00
Daniel Lim Wee Soong 10f0fbc0e5 core/gdbstub: Migrate logging macros 
Change to use the new logging macros
 2018-04-18 21:53:26 +08:00
Weiyi Wang 048b0fc0d3
Merge pull request #3662 from wwylele/shader-hash-cache 
shader: avoid recomputing hash for the same program
 2018-04-18 12:10:25 +03:00
adityaruplaha e5f5fdee2e SDL2: Implement fullscreen 2018-04-17 23:22:23 +05:30
James Rowe 2f8bd18296 Use the QT_TRANSLATE_NOOP macro 2018-04-17 10:42:05 -06:00
wwylele d52ddd0ec4 shader: avoid recomputing hash for the same program 2018-04-17 09:47:59 +03:00
wwylele 3cc460ab34 shader_jit: change passing ShaderSetup to passing uniforms struct into the program 
We are going to add private memebers to ShaderSetup, which forbids the usage of offsetof. The JIT program only use the uniform part of the setup, so we can just isolate it.
 2018-04-17 09:35:43 +03:00
Weiyi Wang cb36f9fad2
Merge pull request #3645 from wwylele/shader-manager 
renderer_opengl: refactor shader & program objects and add shader manager for rasterizer
 2018-04-16 16:38:38 +03:00
baka0815 4321ab44ea citra-qt: Don't translate function keys in InitializeHotkeys() 2018-04-16 12:37:13 +02:00
FearlessTobi fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
Merry d5b1c33587
Merge pull request #3656 from lioncash/relocate 
sm: Relocate the service manager to the System class
 2018-04-15 10:34:14 +01:00
Merry 9e21094dea
Merge pull request #3631 from daniellimws/boss-fmt 
service/boss: Migrate logging macros
 2018-04-15 08:59:42 +01:00
Lioncash a78920e60b
sm: Relocate the service manager to the System class 
Rather than have it live as a global variable, place it into the System class and make it instance-based.
 2018-04-13 07:15:34 -04:00
Lioncash 5309b51c12 cam: Correct forward declaration type for Core::EventType 
This is actually a struct, not a class.
 2018-04-12 23:15:16 -04:00
Weiyi Wang bfd1d963ba
Merge pull request #3638 from ds84182/we-need-more-rounds 
Round TEV outputs and the final fragment output in GLSL
 2018-04-12 23:32:27 +03:00
Weiyi Wang 9772513141
Merge pull request #3639 from wwylele/texture-cude-fix 
gl_rasterizer_cache: exit FillTextureCube when address is invalid
 2018-04-12 22:54:14 +03:00
Weiyi Wang dfe9b4edf8
Merge pull request #3587 from valentinvanelslande/apt-fmt 
Service/APT: Migrate logging macros
 2018-04-12 22:47:44 +03:00
Weiyi Wang 6df2e3ccc9
Merge pull request #3614 from valentinvanelslande/movie-fmt 
movie: migrate logging macros
 2018-04-12 22:46:15 +03:00
Weiyi Wang ca6f6f172b
Merge pull request #3634 from ccawley2011/citra-room-glad 
citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress
 2018-04-12 22:45:30 +03:00
Weiyi Wang f10123f546
Merge pull request #3611 from adityaruplaha/fullscreen-fix 
citra-qt: Fix the stuck in fullscreen bug.
 2018-04-12 22:43:04 +03:00
N00byKing f29f4ccdc9 gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff 2018-04-12 16:44:29 +02:00
wwylele 8dc75598a4 gl_rasterizer: isolate shader management into its own class 2018-04-11 14:52:37 +03:00
wwylele 36bc92273b gl_shader_gen: accept an option to generate separable shaders 2018-04-11 14:52:37 +03:00
wwylele bdab18d2d9 gl_resource_manager: add OGLPipeline 2018-04-11 14:52:37 +03:00
wwylele 4f9b9c4b80 gl_state: add pipeline state 2018-04-11 14:41:43 +03:00
wwylele 48869c768f gl_resource_manager: separate OGLShader and OGLProgram 2018-04-11 14:41:43 +03:00
wwylele d2ee40dc45 gl_shader_util: separate shader object creation and program object creation 2018-04-11 14:41:43 +03:00
wwylele 4256641da4 gl_rasterizer/lighting: implement shadow attenuation 2018-04-10 20:26:55 +03:00
wwylele b5763cb952 pica/lighting: split FresnelSelector into bitfields 
The FresnelSelector was already working like a bitfield, so just make it actual bitfield to reduce redundant code. Also, it is already confirmed that this field also affects shadow on alpha. Given that the only two source that can affect alpha components are both controlled by this field, this field should be renamed to a general alpha switch
 2018-04-10 20:25:56 +03:00
Valentin Vanelslande 7f61eb0ff6
default_ini: remove space in custom_layout 2018-04-08 21:48:07 -05:00
wwylele 7e7de7d3ab gl_rasterizer_cache: exit FillTextureCube when address is invalid 2018-04-08 12:34:50 +03:00
Dwayne Slater 234161ba62 Make byteround less expensive (thanks hrydgard!) 2018-04-07 18:26:14 -04:00
Dwayne Slater 734279ff22 Round TEV outputs and the final fragment output in GLSL 
Fixes water effect in SM3DL
 2018-04-07 16:43:56 -04:00
adityaruplaha 2a7d0ec4be Fix the stuck in fullscreen bug. 
Don't save the UI/RenderWindow geometry if fullscreen was enabled.
 2018-04-07 12:16:07 +05:30
Cameron Cawley cef88965d7 citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress 
Fixes #3538
 2018-04-06 20:27:47 +01:00
Daniel Lim Wee Soong 2d45e46558 service/boss: Migrate logging macros 2018-04-06 19:43:09 +08:00
wwylele 39fce60145 [quick-fix]file-util: fmtlib errors on FILE* type parameter. Explicitly cast it to void* 2018-04-06 13:35:37 +03:00
Weiyi Wang 972db17247
Merge pull request #3497 from wwylele/texture-cube-new 
gl_rasterizer: implement TextureCube
 2018-04-06 12:41:40 +03:00
Weiyi Wang a9544ca015
Merge pull request #3580 from daniellimws/common-fmt 
common: Migrate logging macros
 2018-04-06 12:38:08 +03:00
James Rowe 501717e9db Update fmtlib to fix msvc warnings 
Additionally, when updating fmtlib, there was a change in fmtlib broke
how the old logging macro was overloaded, so this works around that by
just naming the fmtlib macro impl something different
 2018-04-05 22:33:12 -06:00
Weiyi Wang a2e87075c5
Merge pull request #3489 from B3n30/UDS_send_node_information 
NWM_ UDS:Let connected clients handle the eapol packet
 2018-04-05 16:14:39 +03:00
B3n30 f64f118e3b fix Subvs suggestions 2018-04-05 14:57:35 +02:00
B3n30 2d72b2be8b fix Subvs suggestions 2018-04-05 14:43:21 +02:00
Weiyi Wang e3d25bc6d0
Merge pull request #3567 from wwylele/pica-glsl 
renderer_opengl: add PICA->GLSL shader decompiler
 2018-04-05 14:39:27 +03:00
Weiyi Wang acb02d300c
Merge pull request #3518 from wwylele/hashable-struct 
Common/Hash: abstract HashableStruct from GLShader::PicaShaderConfig
 2018-04-05 14:39:12 +03:00
James Rowe 1fecead2ff
Merge pull request #3624 from wwylele/sync-uniform 
gl_rasterizer: move shader uniform sync from SetShader() to ctor
 2018-04-05 00:30:38 -06:00
James Rowe c57b0767af
Merge pull request #3602 from lioncash/json 
verify_login: Make VerifyLogin exceptionless
 2018-04-04 23:39:28 -06:00
wwylele 0d84c5a0b6 gl_rasterizer: move state syncing from ctor to its own function 2018-04-04 17:23:55 +03:00
N00byKing 11cd6d066a
default_ini.h: Update Comment 2018-04-03 15:07:25 +02:00
wwylele c2719feda2 gl_rasterizer: move shader uniform sync from SetShader() to ctor 2018-04-03 09:27:23 +03:00
Merry 7d7101706e
Merge pull request #3621 from daniellimws/dyncom-fmt 
arm/dyncom: Migrate logging macros
 2018-04-02 17:09:36 +01:00
Valentin Vanelslande c9ab184ec7 pica_to_gl: Migrate logging macros (#3608) 2018-04-02 09:31:28 -06:00
wwylele 9ffd400685 gl_shader_decompiler: add missing headers/rename GetXXX to MoveXXX to reflect that they move the data 2018-04-02 17:34:54 +03:00
wwylele 11c2f11872 gl_shader_decompiler: return error on decompilation failure 
Internally these errors are handled by exceptions. Only fallbackable errors (that can be handled by CPU shader emulation) is reported. Completely ill-formed shader is still ASSERTed. Code logic related stuff is DEBUG_ASSERTed
 2018-04-02 17:34:54 +03:00
wwylele 4991b15ee5 gl_shader_decompiler: some small fixes 
- remove unnecessary ";"
- use std::tie for lexicographical ordering
- simplify loop condition
    The offset always has step +1 on each iteration, so it would just hit one of the two boundary anyway
 2018-04-02 17:34:54 +03:00
wwylele f8a292f920 renderer_opengl: add PICA->GLSL shader decompiler 2018-04-02 17:34:54 +03:00
Daniel Lim Wee Soong 1e4eb7def8 arm/dyncom: Migrate logging macros 2018-04-02 16:01:19 +08:00
James Rowe 384849232b
Merge pull request #3516 from wwylele/shadow-sw 
SwRasterizer: Implement shadow mapping
 2018-03-31 23:29:22 -06:00
Merry fff7227f86
Merge pull request #3579 from ccawley2011/architecture-defines 
common: Clean up architecture-specific defines
 2018-03-31 10:41:15 +01:00
Merry 587bc06adf
Merge pull request #3596 from lioncash/disk 
disk_archive: Minor miscellaneous cleanup
 2018-03-31 10:39:00 +01:00
Valentin Vanelslande 4fa1628fb6
movie: migrate logging macros 2018-03-31 00:24:21 -06:00
Lioncash 7d331a469f pica_to_gl: Use std::array where applicable 
Removes the need to use the ARRAY_SIZE macro
 2018-03-31 00:58:49 -04:00
Lioncash 0e7ca706dc disk_archive: Make DiskDirectory's constructor explicit 
Prevents implicit conversions/construction.
 2018-03-31 00:54:17 -04:00
Lioncash 07855c48d1 disk_archive: Remove unnecessary const in DiskDirectory's Read() declaration 
This only applies in the definition of the function, not the
declaration.
 2018-03-31 00:54:17 -04:00
Lioncash ed64d15060 disk_archive: Remove unused total_entries_in_directory member from DiskDirectory 
Also converts initializer list assignments to in-class initializers
where relevant.
 2018-03-31 00:52:47 -04:00
BreadFish64 1d809ce6aa update-icons-signal 2018-03-30 10:20:21 -05:00
Tobias bb6251f35f video_core: Remove Unreachable for invalid BlendEquation modes (#3595) 
* video_core: Remove Unreachable statement

* Lower log level to ERROR
 2018-03-29 17:53:55 -06:00
Merry a567a92468
Merge pull request #3593 from daniellimws/loader-fmt 
core/loader: Migrate logging macros
 2018-03-29 14:45:25 +01:00
Adityarup Laha 180a05c301 sdl2_config: Add a parameter description for tilt clamp variable (#3590) 2018-03-29 10:20:26 +01:00
Weiyi Wang 697ff2f6e3
Merge pull request #3603 from lioncash/port 
citra-room: Fix always false case in main() related to port range
 2018-03-29 11:53:53 +03:00
Weiyi Wang 1c4b230346
Merge pull request #3604 from lioncash/ptr 
archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath()
 2018-03-29 11:52:36 +03:00
Weiyi Wang 82b9387315
Merge pull request #3605 from valentinvanelslande/am-popu64 
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram
 2018-03-29 09:47:56 +03:00
Weiyi Wang 690d92a019
Merge pull request #3601 from lioncash/null 
gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy()
 2018-03-29 09:44:10 +03:00
Weiyi Wang da91fb41db
Merge pull request #3597 from lioncash/lzss 
ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress()
 2018-03-29 09:42:25 +03:00
Weiyi Wang feb4eca2ff
Merge pull request #3598 from lioncash/boss 
boss: Correct ReceiveProperty()'s response data payload
 2018-03-29 09:38:33 +03:00
Weiyi Wang 115fd1cbf0
Merge pull request #3599 from lioncash/err 
err_f: Add missing break in ThrowFatalError()
 2018-03-29 09:38:19 +03:00
Valentin Vanelslande 528d8a6ccb
CiTrace: Migrate logging macros 2018-03-28 20:48:59 -06:00
Valentin Vanelslande 492fca114d
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram 2018-03-28 20:28:18 -06:00
Lioncash 26b1aec3c1 archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath() 
These kinds of casts invoke undefined behavior due to alignment rules.

Use memcpy instead which always does the right thing.
 2018-03-28 22:17:26 -04:00
Lioncash 8366f6cb5e citra-room: Fix always false case in main() related to port range 
If the variable we're checking is a u16, then there can never be values
outside of the 0-65535 range. This is bad because an arbitrary larger
value can be truncated down into a valid value, making an otherwise
malformed argument well-formed.

Change it to use u32 to allow the check to function properly.
 2018-03-28 21:53:05 -04:00
Lioncash 38b9d1780f verify_login: Make VerifyLogin exceptionless 
This function can be simplified by attempting to find the username
within the JSON object and then only accessing it if it does. There's no
need to blindly access the data itself.

This also eliminates the need to copy the string to a local as well,
since we already have the element itself, we can just compare against
it. For the failure case, it's the same if we were checking that the
provided username string is empty.
 2018-03-28 21:34:21 -04:00
Lioncash 27a3d44b16 gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy() 
This should actually be comparing the validity of the destination
surface.
 2018-03-28 21:13:57 -04:00
Valentin Vanelslande 542b11ccdc
Change line 203 2018-03-28 19:05:54 -06:00
Lioncash 5ec576ff78 err_f: Add missing break in ThrowFatalError() 
Introduced by 691f069743

If we hit a prefetch abort, the DFSR and DFAR contents aren't really going to be
that useful.
 2018-03-28 20:33:25 -04:00
Lioncash 31100c582a boss: Correct ReceiveProperty()'s response data payload 
This was previously overwriting data in the same index.
 2018-03-28 20:26:33 -04:00
Lioncash 3af976e41e ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress() 
These kinds of casts invoke undefined behavior, due to both the aliasing
rule, and from an alignment point-of-view. Use the way that's guaranteed
to always work instead.
 2018-03-28 19:55:49 -04:00
Daniel Lim Wee Soong fbfc1103fd core/loader: Migrate logging macros 
Replace logging to use NGLOG instead of LOG.
 2018-03-29 00:08:26 +08:00
Valentin Vanelslande ca6642aa2a
[skip ci] 2018-03-28 08:45:39 -06:00
Daniel Lim Wee Soong 98760336be video_core/shader/shader: Remove include cinttypes 2018-03-28 22:40:16 +08:00
Daniel Lim Wee Soong 730f8a4103 Fix formatting mistakes 2018-03-28 22:28:55 +08:00
Valentin Vanelslande a53365d69e Fix clang 2018-03-27 18:17:04 -06:00
Valentin Vanelslande f1e26fad7f
Fix build 2018-03-27 15:25:57 -06:00
Valentin Vanelslande 4a37d91bc6
change line 528 2018-03-27 14:23:31 -06:00
Valentin Vanelslande e7ac03c941
Service/APT: Migrate logging macros 
Macro of line 528 not changed
 2018-03-27 14:03:00 -06:00
Daniel Lim Wee Soong 20776b37be Fix wrongly converted specifiers 
Sorry that was a lot in one go so some of them had some mistakes
 2018-03-27 23:37:36 +08:00
Daniel Lim Wee Soong 0f4c9c9f47 file_util: Remove long long casting on buf.st_size in NGLOG statement 2018-03-27 23:31:08 +08:00
Daniel Lim Wee Soong 968569aa61 Replace format specifiers for all usages of ASSERT_MSG 2018-03-27 23:28:42 +08:00
Ben 4be12d5f56 NWM_UDS:: Check flags in SendTo (#3481) 
* NWM_UDS:: Check flags in SendTo

* NWM_UDS: SendTo from Host to only oneClient

* fix u8 in flags

* Send node_map to clients

* Libnetwork: Increase libnetwork version

* Broadcast on dest_node_id 0xFFFF

* fixup: dest_node_id offset

* fixup: dest_node_id offset part 2

* Adressed wwyleles feedback

* Adressed wwylele's nits
 2018-03-27 15:01:29 +03:00
BreadFish64 05cf7fe70a QT: Implement themed icons (#3554) 
* implement themed icons

* fix theme search paths
 2018-03-27 12:11:04 +01:00
Daniel Lim Wee Soong 7abfdb164b hw: Migrate logging macros (#3584) 
* hw: Migrate logging macros

Use NGLOG instead of LOG prefixed macros for logging

* gpu: Remove unnecessary casting

At first this line without any casting gave an error. Without knowing which argument is causing the error, I just casted everything. After that forgot to check which argument is the one causing trouble.

* hw: Change format specifiers for the one missed
 2018-03-27 12:02:19 +01:00
Daniel Lim Wee Soong 3e8e011c33 network: Migrate logging macros (#3575) 
* network: Migrate logging macros

Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG

* Remove hash in format
 2018-03-27 12:00:14 +01:00
Weiyi Wang 4bdf2e1eb9
Merge pull request #3569 from daniellimws/audio-core-fmt 
audio_core: Migrate logging macros
 2018-03-27 13:55:24 +03:00
Weiyi Wang 0607bc36e3
Merge pull request #3574 from daniellimws/citra-qt-fmt 
citra_qt: Migrate logging macros
 2018-03-27 13:52:31 +03:00
Daniel Lim Wee Soong 59b8a1dbc2 assert: Undo removal of newline for string with __VA_ARGS__ 2018-03-27 10:01:10 +08:00
Daniel Lim Wee Soong 301ca0a0a3 Undo unrelated true false ternary statement removal 2018-03-26 21:03:10 +08:00
Daniel Lim Wee Soong 5ddc440b48 Change to print program id as hex 2018-03-26 20:44:49 +08:00
FearlessTobi 245a3bd067 game_list: Add missing override specifier for KeyReleaseEater's eventFilter function 2018-03-25 23:57:25 +02:00
Weiyi Wang 49c41593d9
Merge pull request #3577 from daniellimws/web-service-fmt 
web_service: Migrate logging macros
 2018-03-25 13:47:46 +03:00
Daniel Lim Wee Soong 111da6db06 common: Migrate logging macros 
Follow-up of #3533

Replace logging to use NGLOG instead of LOG

This is significantly larger than the previous ones.
 2018-03-25 18:42:50 +08:00
Daniel Lim Wee Soong 4617fec970 input_common: Migrate logging macros 
Follow-up of #3533

Replace logging to use NGLOG instead of LOG
 2018-03-25 17:46:02 +08:00
Daniel Lim Wee Soong 978a169cc4 Drop # for formatting program id 2018-03-25 15:48:29 +08:00
Daniel Lim Wee Soong c82cd30f62 web_service: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-25 15:35:06 +08:00
Daniel Lim Wee Soong 79b0e62455 citra_qt: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-25 13:00:36 +08:00
James 9283053701 Move WebServices to use LibreSSL + cpp-httplib (#3501) 
Move WebServices to use LibreSSL + cpp-httplib

Remove curl + openssl build dependencies
 2018-03-24 13:19:35 -06:00
Valentin Vanelslande e2c5666883 Service/AM: Fix crash when scanning titles with installed titles with invalid title IDs (#3542) 
* Service/AM: Fix crash when scanning titles with installed titles with invalid title IDs

Fixes #3332
 2018-03-24 13:06:50 -06:00
Daniel Lim Wee Soong 38e2b6c8d8 Undo changes to unrelated files and fix formatting 2018-03-25 00:54:40 +08:00
Daniel Lim Wee Soong df816b5eaf Address review comments 
* Convert %x to {:x}
* Convert {0:#010x} to {:#010x}
* Remove `? true : false` statement
* Remove `.c_str()` for strings
 2018-03-24 22:25:50 +08:00
Daniel Lim Wee Soong 693b190274 audio_core: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-24 21:45:58 +08:00
Merry 174e7e268a
Merge pull request #3533 from daniellimws/fmtlib-macros 
Logging: Add fmtlib-based macros
 2018-03-24 08:04:20 +00:00
Daniel Lim Wee Soong 11ce0f91ab Remove dependency chrono 
Was included last time due to adding Entry into log.h

Now it is no longer needed but I forgot to remove it last time
 2018-03-22 21:42:02 +08:00
Cameron Cawley 2520ad57a5 common: Use ARCHITECTURE_x86_64 instead of ARCHITECTURE_X64 2018-03-21 22:19:59 +00:00
Cameron Cawley 1afcaed1ff common: Use ARCHITECTURE_ARM instead of _M_ARM 2018-03-21 22:17:42 +00:00
Daniel Lim Wee Soong 4adbf29b0c Fix clang-format 
Oops forgot to check...
 2018-03-22 00:45:01 +08:00
Daniel Lim Wee Soong e6ee1020e1 Replace ##__VA_ARGS__ with __VA_ARGS__ 2018-03-22 00:40:01 +08:00
Daniel Lim Wee Soong c892cea029 Place FmtLogMessage's definition in backend.cpp 
I decided to overload LogMessage because I don't see a reason to come up with a new function name just for this, but if you guys want me to overload FmtLogMessage instead I'm fine with that.
 2018-03-21 23:36:45 +08:00
Weiyi Wang d03f72eb56
Merge pull request #3535 from ccawley2011/emu_arch_bits 
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
 2018-03-21 16:15:22 +02:00
Daniel Lim Wee Soong ceeb2810fe Add nullptr check to LogEntry 
Also remove explicit comparison with nullptr to make code shorter.
 2018-03-20 14:15:48 +08:00
Weiyi Wang 9e4f670ea9
Merge pull request #3484 from wwylele/highlight-fix 
pica/lighting: compute highlight clamp after one-/two-sided diffuse pass
 2018-03-18 23:41:27 +02:00
Weiyi Wang 42ed0254db
Merge pull request #3528 from BreadFish64/auto-nvidia 
use nvidia graphics automatically on laptops with optimus
 2018-03-18 23:41:08 +02:00
Mat M 79d1bcf5ba
Merge pull request #3506 from MerryMage/mov-gl_resource_manager 
gl_resource_manager: Use std::exchange in move assignment operators and constructors
 2018-03-17 16:30:58 -04:00
Daniel Lim Wee Soong 2b4998a122 Add check if filter is not a nullptr 
Fix segfault and pass tests
 2018-03-17 22:55:57 +08:00