Commit graph

5369 commits

Author SHA1 Message Date
Valentin Vanelslande b12942a231
gl_shader_gen: remove newline in logging macro 2018-06-30 19:15:15 -05:00
Valentin Vanelslande fef231dc5b
gl_shader_manager: fix macro 2018-06-30 11:24:38 -05:00
Weiyi Wang ffae5be1ea
Merge pull request #3895 from NarcolepticK/pm-migrate-framework
service/pm: Migrate to ServiceFramework
2018-06-30 13:20:31 +03:00
wwylele 810b86f451 citra_qt: only toggle console if the setting has been changed 2018-06-30 13:07:30 +03:00
wwylele 4d4b833a00 swrasterizer, gl_shader_gen: return 0.0 for Disabled texture unit 0 2018-06-30 11:36:39 +03:00
zhupengfei f23443b921
applets/swkbd: Implement DefaultCitraKeyboard 2018-06-30 08:01:50 +08:00
zhupengfei 18664c719e
frontend/applets: misc fixes
* Renamed applet to applets

* Added log classes Applet and Applet.SWKBD

* Fixes to get it compile
2018-06-30 08:01:49 +08:00
James Rowe caacefcc2e
frontend/applets: frontend swkbd base
Original commits by @jroweboy:

* Rebase out the other commit

* changing branches

* More work on stuff and things ecks DEE

Changes by @zhaowenlan1779:

* Removed #include of result.h
2018-06-30 08:01:31 +08:00
James Rowe f9a89ff410
Merge pull request #3894 from wwylele/log-finalize
Finalize logging system migration
2018-06-29 17:46:07 -06:00
Valentin Vanelslande 7ffcf71d5d
Service/DLP: IsChild: Skip parameter 2018-06-29 13:40:03 -05:00
Valentin Vanelslande 482dc91dd6
Service/DLP: Fix IsChild 2018-06-29 13:03:16 -05:00
NarcolepticK f72d114335 service/pm: Migrate to ServiceFramework 2018-06-29 10:31:56 -04:00
wwylele 0eab948728 reformat all files with clang-format 2018-06-29 16:56:12 +03:00
wwylele 7c5a76e58b log: replace all NGLOG with LOG 2018-06-29 14:18:07 +03:00
wwylele fde415968e log: remove deprecated log macros 2018-06-29 14:02:29 +03:00
NarcolepticK a1e56c1811 service/dlp: Addressed comment about what value to push 2018-06-29 04:27:37 -04:00
NarcolepticK f5f5ac2197 service/dlp: Migrate to ServiceFramework 2018-06-29 04:24:38 -04:00
Weiyi Wang fc8f997a28
Merge pull request #3874 from wwylele/ssl-new-framework
service/SSL: convert to ServiceFramework
2018-06-29 11:17:26 +03:00
NarcolepticK db75b80e22 service/mvd: Migrate to ServiceFramework (#3890)
* service/mvd: Migrate to ServiceFramework

* service/mvd: Silenced clang format
2018-06-29 11:14:49 +03:00
NarcolepticK 3e42b361b1 service/qtm: Migrate to ServiceFramework (#3892)
* service/qtm: Migrate to ServiceFramework

* service/qtm: Fix clang format
2018-06-29 11:13:56 +03:00
NarcolepticK 9ae70e733f video-core: Migrate logging macros (#3878)
* video-core: Migrate logging macros

* video-core: Fixed missed clang format

* video-core: Migrated LOG_GENERIC macro
2018-06-29 00:13:30 +03:00
Weiyi Wang 3cf5c1a5b4
Merge pull request #3889 from zhaowenlan1779/camera-ui-fix
citra_qt: Fix image file selection dialog
2018-06-28 18:36:06 +03:00
Weiyi Wang 7d535140f6
Merge pull request #3885 from wwylele/fix-fs-log
FS: fix log with incorrect type
2018-06-28 18:06:56 +03:00
NarcolepticK f96497abdb service/dsp: Migrate logging macros (#3863)
* service/dsp: Migrate logging macros

* service/dsp: Fixed width count
2018-06-28 18:05:45 +03:00
Weiyi Wang 1619b124b5
Merge pull request #3887 from NarcolepticK/gsp_lcd-migrate-framework
service/gsp: Migrate gsp_lcd to ServiceFramework
2018-06-28 18:04:04 +03:00
Weiyi Wang 80f6510355
Merge pull request #3851 from wwylele/shut-up-texture3
gl_shader_gen: lower log level of using disabled proctex
2018-06-28 18:03:05 +03:00
zhupengfei 0bd843f324
citra_qt: Fix image file selection dialog 2018-06-28 22:35:12 +08:00
NarcolepticK d25cfbc4cc service/gsp: Addressed comment about global state 2018-06-27 11:05:38 -04:00
NarcolepticK 188979b3e2 service/gsp: Migrate gsp_lcd to ServiceFramework 2018-06-27 10:40:37 -04:00
wwylele 5150de8613 FS: fix log with incorrect type 2018-06-27 17:15:01 +03:00
NarcolepticK b94cb61de8 service/gsp: Add Stub for InvalidateDataCache 2018-06-27 04:19:45 -04:00
NarcolepticK c6554f1fbc service/gsp: Fixed typo in FlushDataCache IPC::RequestParser creation 2018-06-27 04:19:45 -04:00
NarcolepticK c43f1ed088 service/gsp: Move service/gsp_lcd.* into service/gsp/ folder 2018-06-27 04:19:45 -04:00
James Rowe 5e641d16d0
Merge pull request #3834 from j-selby/fix-cpp-httplib
Update cpp-httplib for gzip + chunked encoding fixes
2018-06-26 09:57:08 -06:00
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