Mirrors/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra synced 2024-11-15 13:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6171 commits 1 branch 19 tags 63 MiB
Commit graph

6171 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stevie
c25f56a147 Baseline OSX Travis CI build to 10.13 (#3765) 
Bump Travis CI xcode9.2 to xcode9.3.
 2018-05-31 22:24:18 -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
131cf363da
Merge pull request #3790 from jbeich/master 
cryptopp: unbreak on aarch64
 2018-05-31 22:14:03 -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
朱鹏飞
84728cb8d3 Update README.md to describe current condition more accurately (#3737) 
Update README.md to describe current condition more accurately
 2018-05-29 23:51:25 -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
James Rowe
0095c20b8d
Merge pull request #3594 from valentinvanelslande/hotkeys 
citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys
 2018-05-29 22:19:23 -06:00
Jan Beich
2772362f05 cryptopp: add missing bits used by SIMD on aarch64 
externals/cryptopp/cryptopp/crc-simd.cpp:97:13: error: use of undeclared identifier '__crc32w'
        w = __crc32w(w,x);
            ^
externals/cryptopp/cryptopp/rijndael-simd.cpp:126:25: error: use of undeclared identifier 'vaeseq_u8'
        uint8x16_t r1 = vaeseq_u8(data, key);
                        ^
externals/cryptopp/cryptopp/sha-simd.cpp:109:25: error: use of undeclared identifier 'vsha1cq_u32'
        uint32x4_t r1 = vsha1cq_u32 (data1, 0, data2);
                        ^

/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbeNEON()'
/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbeCRC32()'
/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbePMULL()'
 2018-05-28 23:03:55 +00:00
Valentin Vanelslande
90bcb26c3b citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys 2018-05-28 16:36:56 -05:00
Weiyi Wang
65f5bc73a0
Merge pull request #3789 from degasus/texture_bindings 
gl_rasterizer: Don't flip the texture bindings.
 2018-05-28 23:14:09 +03: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
549abe556b Service/NDM: convert to ServiceFramework 2018-05-28 11:28:13 +03:00
Weiyi Wang
09982c3386
Merge pull request #3732 from ccawley2011/fix-arm 
Fix compilation on ARM
 2018-05-26 20:14:55 +03:00
Weiyi Wang
03209efe99
Merge pull request #3753 from spbennett/json_3.12 
Upgrade JSON for Modern C++
 2018-05-25 20:39:12 +03:00
Weiyi Wang
cad00ea5fd
Merge pull request #3755 from spbennett/xbyak-5.64 
Xbyak 5.64
 2018-05-25 20:38:52 +03: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
Weiyi Wang
1c03ff14c5
Merge pull request #3777 from einstein95/patch-1 
Fix build
 2018-05-25 13:17:27 +03:00
Logan B
b5934237fa
Fix build 2018-05-25 20:28:15 +12:00
darkf
83ee80666f Import cubeb as an external 2018-05-25 02:06:28 -05:00
Steve Bennett
a7f73b9a14 Xbyak 5.64 
---

Updated to Xbyak 5.64
811f4959ee
 2018-05-19 13:03:55 -07:00
Steve Bennett
b9eeca218d Upgrade JSON for Modern C++ 
---

Upgrade JSON for Modern C++ to 3.1.2
https://raw.githubusercontent.com/nlohmann/json/v3.1.2/single_include/nlohmann/json.hpp
 2018-05-19 12:59:38 -07:00
Weiyi Wang
45aa95093c
Merge pull request #3744 from liushuyu/master 
travis: use cmake in official repository
 2018-05-19 18:24:20 +03:00
Weiyi Wang
0c60e96533
Merge pull request #3758 from j-selby/fix-text-formatter 
Add missing std::string import in text_formatter
 2018-05-19 14:47:30 +03:00
James
29551c187a Add missing std::string import in text_formatter 2018-05-19 21:31:09 +10: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
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
liushuyu
b2e3fd528b
travis: use cmake in official repository 2018-05-13 14:34:33 -06:00
Cameron Cawley
101d8964f1 common: Fix compilation on ARM 2018-05-13 11:34:45 +01:00
Cameron Cawley
46f43bc4f7 cryptopp: Fix compilation on non-x86/x86_64 systems 2018-05-13 11:34:32 +01:00
wwylele
1d5a26b1d8 citra-qt: add gpu shader emulation related configurations 2018-05-13 10:58:20 +03:00