citra-emu
/
citra
Archived
1
0
Fork 0
Commit Graph

5335 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