lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-23 23:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
6151 commits 7 branches 3 tags 148 MiB
Commit graph

6151 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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 e48662196f
Merge pull request #3735 from wwylele/transifex-test-2 
travis: fix dependency name for transifex job
 2018-05-11 23:35:55 -06:00
wwylele f64a4729f0 travis: fix dependency name for transifex job 2018-05-12 01:18:02 +03:00
James Rowe afe445fc57
Merge pull request #3734 from wwylele/transifex-push-fix 
travis: add missing dependency for transifex push job
 2018-05-11 15:49:28 -06:00
wwylele 7f7ee048f3 travis: add missing dependency for transifex push job 2018-05-12 00:22:05 +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
Ben bcecfac0ef
Merge pull request #3688 from Hexagon12/translation-update 
Added current translations from Transifex
 2018-05-10 20:38:54 +02:00
FearlessTobi f354744ad4 citra_qt: Refactor game list compatibilty 2018-05-10 03:57:57 +02:00
Weiyi Wang 3bd1cd0b2b
Merge pull request #3719 from wwylele/regs-pipeline-type 
regs_pipeline: use proper unsigned type where applicable
 2018-05-09 13:51:36 +03:00
Hexagon12 17bca8b12f
Updated the translations one more time 2018-05-07 16:31:33 +03:00
wwylele 68b0a3e19e regs_pipeline: use proper unsigned type where applicable 2018-05-06 15:57:48 +03:00
朱鹏飞 590a09d004 CI: Add qwindowsvistastyle.dll (#3716) 2018-05-05 22:39:07 -06: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