emu-mirror/citra-nightly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,241 Commits 1 Branch 0 Tags 50 MiB
705eb597c8
Commit Graph

5156 Commits

Author SHA1 Message Date
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