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

5220 commits

Author SHA1 Message Date
朱鹏飞
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
Merry
d5b1c33587
Merge pull request #3656 from lioncash/relocate 
sm: Relocate the service manager to the System class
 2018-04-15 10:34:14 +01:00
Merry
9e21094dea
Merge pull request #3631 from daniellimws/boss-fmt 
service/boss: Migrate logging macros
 2018-04-15 08:59:42 +01:00
Lioncash
a78920e60b
sm: Relocate the service manager to the System class 
Rather than have it live as a global variable, place it into the System class and make it instance-based.
 2018-04-13 07:15:34 -04:00
Lioncash
5309b51c12 cam: Correct forward declaration type for Core::EventType 
This is actually a struct, not a class.
 2018-04-12 23:15:16 -04:00
Weiyi Wang
bfd1d963ba
Merge pull request #3638 from ds84182/we-need-more-rounds 
Round TEV outputs and the final fragment output in GLSL
 2018-04-12 23:32:27 +03:00
Weiyi Wang
9772513141
Merge pull request #3639 from wwylele/texture-cude-fix 
gl_rasterizer_cache: exit FillTextureCube when address is invalid
 2018-04-12 22:54:14 +03:00
Weiyi Wang
dfe9b4edf8
Merge pull request #3587 from valentinvanelslande/apt-fmt 
Service/APT: Migrate logging macros
 2018-04-12 22:47:44 +03:00
Weiyi Wang
6df2e3ccc9
Merge pull request #3614 from valentinvanelslande/movie-fmt 
movie: migrate logging macros
 2018-04-12 22:46:15 +03:00
Weiyi Wang
ca6f6f172b
Merge pull request #3634 from ccawley2011/citra-room-glad 
citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress
 2018-04-12 22:45:30 +03:00
Weiyi Wang
f10123f546
Merge pull request #3611 from adityaruplaha/fullscreen-fix 
citra-qt: Fix the stuck in fullscreen bug.
 2018-04-12 22:43:04 +03:00
N00byKing
f29f4ccdc9 gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff 2018-04-12 16:44:29 +02:00
wwylele
8dc75598a4 gl_rasterizer: isolate shader management into its own class 2018-04-11 14:52:37 +03:00
wwylele
36bc92273b gl_shader_gen: accept an option to generate separable shaders 2018-04-11 14:52:37 +03:00
wwylele
bdab18d2d9 gl_resource_manager: add OGLPipeline 2018-04-11 14:52:37 +03:00
wwylele
4f9b9c4b80 gl_state: add pipeline state 2018-04-11 14:41:43 +03:00
wwylele
48869c768f gl_resource_manager: separate OGLShader and OGLProgram 2018-04-11 14:41:43 +03:00
wwylele
d2ee40dc45 gl_shader_util: separate shader object creation and program object creation 2018-04-11 14:41:43 +03:00
wwylele
4256641da4 gl_rasterizer/lighting: implement shadow attenuation 2018-04-10 20:26:55 +03:00
wwylele
b5763cb952 pica/lighting: split FresnelSelector into bitfields 
The FresnelSelector was already working like a bitfield, so just make it actual bitfield to reduce redundant code. Also, it is already confirmed that this field also affects shadow on alpha. Given that the only two source that can affect alpha components are both controlled by this field, this field should be renamed to a general alpha switch
 2018-04-10 20:25:56 +03:00
Valentin Vanelslande
7f61eb0ff6
default_ini: remove space in custom_layout 2018-04-08 21:48:07 -05:00
wwylele
7e7de7d3ab gl_rasterizer_cache: exit FillTextureCube when address is invalid 2018-04-08 12:34:50 +03:00
Dwayne Slater
234161ba62 Make byteround less expensive (thanks hrydgard!) 2018-04-07 18:26:14 -04:00
Dwayne Slater
734279ff22 Round TEV outputs and the final fragment output in GLSL 
Fixes water effect in SM3DL
 2018-04-07 16:43:56 -04:00
adityaruplaha
2a7d0ec4be Fix the stuck in fullscreen bug. 
Don't save the UI/RenderWindow geometry if fullscreen was enabled.
 2018-04-07 12:16:07 +05:30
Cameron Cawley
cef88965d7 citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress 
Fixes #3538
 2018-04-06 20:27:47 +01:00
Daniel Lim Wee Soong
2d45e46558 service/boss: Migrate logging macros 2018-04-06 19:43:09 +08:00
wwylele
39fce60145 [quick-fix]file-util: fmtlib errors on FILE* type parameter. Explicitly cast it to void* 2018-04-06 13:35:37 +03:00
Weiyi Wang
972db17247
Merge pull request #3497 from wwylele/texture-cube-new 
gl_rasterizer: implement TextureCube
 2018-04-06 12:41:40 +03:00
Weiyi Wang
a9544ca015
Merge pull request #3580 from daniellimws/common-fmt 
common: Migrate logging macros
 2018-04-06 12:38:08 +03:00
James Rowe
501717e9db Update fmtlib to fix msvc warnings 
Additionally, when updating fmtlib, there was a change in fmtlib broke
how the old logging macro was overloaded, so this works around that by
just naming the fmtlib macro impl something different
 2018-04-05 22:33:12 -06:00
Weiyi Wang
a2e87075c5
Merge pull request #3489 from B3n30/UDS_send_node_information 
NWM_ UDS:Let connected clients handle the eapol packet
 2018-04-05 16:14:39 +03:00
B3n30
f64f118e3b fix Subvs suggestions 2018-04-05 14:57:35 +02:00
B3n30
2d72b2be8b fix Subvs suggestions 2018-04-05 14:43:21 +02:00
Weiyi Wang
e3d25bc6d0
Merge pull request #3567 from wwylele/pica-glsl 
renderer_opengl: add PICA->GLSL shader decompiler
 2018-04-05 14:39:27 +03:00
Weiyi Wang
acb02d300c
Merge pull request #3518 from wwylele/hashable-struct 
Common/Hash: abstract HashableStruct from GLShader::PicaShaderConfig
 2018-04-05 14:39:12 +03:00
James Rowe
1fecead2ff
Merge pull request #3624 from wwylele/sync-uniform 
gl_rasterizer: move shader uniform sync from SetShader() to ctor
 2018-04-05 00:30:38 -06:00
James Rowe
c57b0767af
Merge pull request #3602 from lioncash/json 
verify_login: Make VerifyLogin exceptionless
 2018-04-04 23:39:28 -06:00
wwylele
0d84c5a0b6 gl_rasterizer: move state syncing from ctor to its own function 2018-04-04 17:23:55 +03:00
N00byKing
11cd6d066a
default_ini.h: Update Comment 2018-04-03 15:07:25 +02:00
wwylele
c2719feda2 gl_rasterizer: move shader uniform sync from SetShader() to ctor 2018-04-03 09:27:23 +03:00
Merry
7d7101706e
Merge pull request #3621 from daniellimws/dyncom-fmt 
arm/dyncom: Migrate logging macros
 2018-04-02 17:09:36 +01:00
Valentin Vanelslande
c9ab184ec7 pica_to_gl: Migrate logging macros (#3608) 2018-04-02 09:31:28 -06:00
wwylele
9ffd400685 gl_shader_decompiler: add missing headers/rename GetXXX to MoveXXX to reflect that they move the data 2018-04-02 17:34:54 +03:00
wwylele
11c2f11872 gl_shader_decompiler: return error on decompilation failure 
Internally these errors are handled by exceptions. Only fallbackable errors (that can be handled by CPU shader emulation) is reported. Completely ill-formed shader is still ASSERTed. Code logic related stuff is DEBUG_ASSERTed
 2018-04-02 17:34:54 +03:00
wwylele
4991b15ee5 gl_shader_decompiler: some small fixes 
- remove unnecessary ";"
- use std::tie for lexicographical ordering
- simplify loop condition
    The offset always has step +1 on each iteration, so it would just hit one of the two boundary anyway
 2018-04-02 17:34:54 +03:00
wwylele
f8a292f920 renderer_opengl: add PICA->GLSL shader decompiler 2018-04-02 17:34:54 +03:00
Daniel Lim Wee Soong
1e4eb7def8 arm/dyncom: Migrate logging macros 2018-04-02 16:01:19 +08:00
James Rowe
384849232b
Merge pull request #3516 from wwylele/shadow-sw 
SwRasterizer: Implement shadow mapping
 2018-03-31 23:29:22 -06:00
Merry
fff7227f86
Merge pull request #3579 from ccawley2011/architecture-defines 
common: Clean up architecture-specific defines
 2018-03-31 10:41:15 +01:00
Merry
587bc06adf
Merge pull request #3596 from lioncash/disk 
disk_archive: Minor miscellaneous cleanup
 2018-03-31 10:39:00 +01:00
Valentin Vanelslande
4fa1628fb6
movie: migrate logging macros 2018-03-31 00:24:21 -06:00
Lioncash
7d331a469f pica_to_gl: Use std::array where applicable 
Removes the need to use the ARRAY_SIZE macro
 2018-03-31 00:58:49 -04:00
Lioncash
0e7ca706dc disk_archive: Make DiskDirectory's constructor explicit 
Prevents implicit conversions/construction.
 2018-03-31 00:54:17 -04:00
Lioncash
07855c48d1 disk_archive: Remove unnecessary const in DiskDirectory's Read() declaration 
This only applies in the definition of the function, not the
declaration.
 2018-03-31 00:54:17 -04:00
Lioncash
ed64d15060 disk_archive: Remove unused total_entries_in_directory member from DiskDirectory 
Also converts initializer list assignments to in-class initializers
where relevant.
 2018-03-31 00:52:47 -04:00
BreadFish64
1d809ce6aa update-icons-signal 2018-03-30 10:20:21 -05:00
Tobias
bb6251f35f video_core: Remove Unreachable for invalid BlendEquation modes (#3595) 
* video_core: Remove Unreachable statement

* Lower log level to ERROR
 2018-03-29 17:53:55 -06:00
Merry
a567a92468
Merge pull request #3593 from daniellimws/loader-fmt 
core/loader: Migrate logging macros
 2018-03-29 14:45:25 +01:00
Adityarup Laha
180a05c301 sdl2_config: Add a parameter description for tilt clamp variable (#3590) 2018-03-29 10:20:26 +01:00
Weiyi Wang
697ff2f6e3
Merge pull request #3603 from lioncash/port 
citra-room: Fix always false case in main() related to port range
 2018-03-29 11:53:53 +03:00
Weiyi Wang
1c4b230346
Merge pull request #3604 from lioncash/ptr 
archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath()
 2018-03-29 11:52:36 +03:00
Weiyi Wang
82b9387315
Merge pull request #3605 from valentinvanelslande/am-popu64 
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram
 2018-03-29 09:47:56 +03:00
Weiyi Wang
690d92a019
Merge pull request #3601 from lioncash/null 
gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy()
 2018-03-29 09:44:10 +03:00
Weiyi Wang
da91fb41db
Merge pull request #3597 from lioncash/lzss 
ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress()
 2018-03-29 09:42:25 +03:00
Weiyi Wang
feb4eca2ff
Merge pull request #3598 from lioncash/boss 
boss: Correct ReceiveProperty()'s response data payload
 2018-03-29 09:38:33 +03:00
Weiyi Wang
115fd1cbf0
Merge pull request #3599 from lioncash/err 
err_f: Add missing break in ThrowFatalError()
 2018-03-29 09:38:19 +03:00
Valentin Vanelslande
528d8a6ccb
CiTrace: Migrate logging macros 2018-03-28 20:48:59 -06:00
Valentin Vanelslande
492fca114d
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram 2018-03-28 20:28:18 -06:00
Lioncash
26b1aec3c1 archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath() 
These kinds of casts invoke undefined behavior due to alignment rules.

Use memcpy instead which always does the right thing.
 2018-03-28 22:17:26 -04:00
Lioncash
8366f6cb5e citra-room: Fix always false case in main() related to port range 
If the variable we're checking is a u16, then there can never be values
outside of the 0-65535 range. This is bad because an arbitrary larger
value can be truncated down into a valid value, making an otherwise
malformed argument well-formed.

Change it to use u32 to allow the check to function properly.
 2018-03-28 21:53:05 -04:00
Lioncash
38b9d1780f verify_login: Make VerifyLogin exceptionless 
This function can be simplified by attempting to find the username
within the JSON object and then only accessing it if it does. There's no
need to blindly access the data itself.

This also eliminates the need to copy the string to a local as well,
since we already have the element itself, we can just compare against
it. For the failure case, it's the same if we were checking that the
provided username string is empty.
 2018-03-28 21:34:21 -04:00
Lioncash
27a3d44b16 gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy() 
This should actually be comparing the validity of the destination
surface.
 2018-03-28 21:13:57 -04:00
Valentin Vanelslande
542b11ccdc
Change line 203 2018-03-28 19:05:54 -06:00
Lioncash
5ec576ff78 err_f: Add missing break in ThrowFatalError() 
Introduced by 691f069743

If we hit a prefetch abort, the DFSR and DFAR contents aren't really going to be
that useful.
 2018-03-28 20:33:25 -04:00
Lioncash
31100c582a boss: Correct ReceiveProperty()'s response data payload 
This was previously overwriting data in the same index.
 2018-03-28 20:26:33 -04:00
Lioncash
3af976e41e ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress() 
These kinds of casts invoke undefined behavior, due to both the aliasing
rule, and from an alignment point-of-view. Use the way that's guaranteed
to always work instead.
 2018-03-28 19:55:49 -04:00
Daniel Lim Wee Soong
fbfc1103fd core/loader: Migrate logging macros 
Replace logging to use NGLOG instead of LOG.
 2018-03-29 00:08:26 +08:00
Valentin Vanelslande
ca6642aa2a
[skip ci] 2018-03-28 08:45:39 -06:00
Daniel Lim Wee Soong
98760336be video_core/shader/shader: Remove include cinttypes 2018-03-28 22:40:16 +08:00
Daniel Lim Wee Soong
730f8a4103 Fix formatting mistakes 2018-03-28 22:28:55 +08:00
Valentin Vanelslande
a53365d69e Fix clang 2018-03-27 18:17:04 -06:00
Valentin Vanelslande
f1e26fad7f
Fix build 2018-03-27 15:25:57 -06:00
Valentin Vanelslande
4a37d91bc6
change line 528 2018-03-27 14:23:31 -06:00
Valentin Vanelslande
e7ac03c941
Service/APT: Migrate logging macros 
Macro of line 528 not changed
 2018-03-27 14:03:00 -06:00
Daniel Lim Wee Soong
20776b37be Fix wrongly converted specifiers 
Sorry that was a lot in one go so some of them had some mistakes
 2018-03-27 23:37:36 +08:00
Daniel Lim Wee Soong
0f4c9c9f47 file_util: Remove long long casting on buf.st_size in NGLOG statement 2018-03-27 23:31:08 +08:00
Daniel Lim Wee Soong
968569aa61 Replace format specifiers for all usages of ASSERT_MSG 2018-03-27 23:28:42 +08:00
Ben
4be12d5f56 NWM_UDS:: Check flags in SendTo (#3481) 
* NWM_UDS:: Check flags in SendTo

* NWM_UDS: SendTo from Host to only oneClient

* fix u8 in flags

* Send node_map to clients

* Libnetwork: Increase libnetwork version

* Broadcast on dest_node_id 0xFFFF

* fixup: dest_node_id offset

* fixup: dest_node_id offset part 2

* Adressed wwyleles feedback

* Adressed wwylele's nits
 2018-03-27 15:01:29 +03:00
BreadFish64
05cf7fe70a QT: Implement themed icons (#3554) 
* implement themed icons

* fix theme search paths
 2018-03-27 12:11:04 +01:00
Daniel Lim Wee Soong
7abfdb164b hw: Migrate logging macros (#3584) 
* hw: Migrate logging macros

Use NGLOG instead of LOG prefixed macros for logging

* gpu: Remove unnecessary casting

At first this line without any casting gave an error. Without knowing which argument is causing the error, I just casted everything. After that forgot to check which argument is the one causing trouble.

* hw: Change format specifiers for the one missed
 2018-03-27 12:02:19 +01:00
Daniel Lim Wee Soong
3e8e011c33 network: Migrate logging macros (#3575) 
* network: Migrate logging macros

Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG

* Remove hash in format
 2018-03-27 12:00:14 +01:00
Weiyi Wang
4bdf2e1eb9
Merge pull request #3569 from daniellimws/audio-core-fmt 
audio_core: Migrate logging macros
 2018-03-27 13:55:24 +03:00
Weiyi Wang
0607bc36e3
Merge pull request #3574 from daniellimws/citra-qt-fmt 
citra_qt: Migrate logging macros
 2018-03-27 13:52:31 +03:00
Daniel Lim Wee Soong
59b8a1dbc2 assert: Undo removal of newline for string with __VA_ARGS__ 2018-03-27 10:01:10 +08:00
Daniel Lim Wee Soong
301ca0a0a3 Undo unrelated true false ternary statement removal 2018-03-26 21:03:10 +08:00
Daniel Lim Wee Soong
5ddc440b48 Change to print program id as hex 2018-03-26 20:44:49 +08:00
FearlessTobi
245a3bd067 game_list: Add missing override specifier for KeyReleaseEater's eventFilter function 2018-03-25 23:57:25 +02:00
Weiyi Wang
49c41593d9
Merge pull request #3577 from daniellimws/web-service-fmt 
web_service: Migrate logging macros
 2018-03-25 13:47:46 +03:00
Daniel Lim Wee Soong
111da6db06 common: Migrate logging macros 
Follow-up of #3533

Replace logging to use NGLOG instead of LOG

This is significantly larger than the previous ones.
 2018-03-25 18:42:50 +08:00
Daniel Lim Wee Soong
4617fec970 input_common: Migrate logging macros 
Follow-up of #3533

Replace logging to use NGLOG instead of LOG
 2018-03-25 17:46:02 +08:00
Daniel Lim Wee Soong
978a169cc4 Drop # for formatting program id 2018-03-25 15:48:29 +08:00
Daniel Lim Wee Soong
c82cd30f62 web_service: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-25 15:35:06 +08:00
Daniel Lim Wee Soong
79b0e62455 citra_qt: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-25 13:00:36 +08:00
James
9283053701 Move WebServices to use LibreSSL + cpp-httplib (#3501) 
Move WebServices to use LibreSSL + cpp-httplib

Remove curl + openssl build dependencies
 2018-03-24 13:19:35 -06:00
Valentin Vanelslande
e2c5666883 Service/AM: Fix crash when scanning titles with installed titles with invalid title IDs (#3542) 
* Service/AM: Fix crash when scanning titles with installed titles with invalid title IDs

Fixes #3332
 2018-03-24 13:06:50 -06:00
Daniel Lim Wee Soong
38e2b6c8d8 Undo changes to unrelated files and fix formatting 2018-03-25 00:54:40 +08:00
Daniel Lim Wee Soong
df816b5eaf Address review comments 
* Convert %x to {:x}
* Convert {0:#010x} to {:#010x}
* Remove `? true : false` statement
* Remove `.c_str()` for strings
 2018-03-24 22:25:50 +08:00
Daniel Lim Wee Soong
693b190274 audio_core: Migrate logging macros 
Follow-up of #3533

Replace prefix of all logging macros from LOG to NGLOG
 2018-03-24 21:45:58 +08:00
Merry
174e7e268a
Merge pull request #3533 from daniellimws/fmtlib-macros 
Logging: Add fmtlib-based macros
 2018-03-24 08:04:20 +00:00
Daniel Lim Wee Soong
11ce0f91ab Remove dependency chrono 
Was included last time due to adding Entry into log.h

Now it is no longer needed but I forgot to remove it last time
 2018-03-22 21:42:02 +08:00
Cameron Cawley
2520ad57a5 common: Use ARCHITECTURE_x86_64 instead of ARCHITECTURE_X64 2018-03-21 22:19:59 +00:00
Cameron Cawley
1afcaed1ff common: Use ARCHITECTURE_ARM instead of _M_ARM 2018-03-21 22:17:42 +00:00
Daniel Lim Wee Soong
4adbf29b0c Fix clang-format 
Oops forgot to check...
 2018-03-22 00:45:01 +08:00
Daniel Lim Wee Soong
e6ee1020e1 Replace ##__VA_ARGS__ with __VA_ARGS__ 2018-03-22 00:40:01 +08:00
Daniel Lim Wee Soong
c892cea029 Place FmtLogMessage's definition in backend.cpp 
I decided to overload LogMessage because I don't see a reason to come up with a new function name just for this, but if you guys want me to overload FmtLogMessage instead I'm fine with that.
 2018-03-21 23:36:45 +08:00
Weiyi Wang
d03f72eb56
Merge pull request #3535 from ccawley2011/emu_arch_bits 
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
 2018-03-21 16:15:22 +02:00
Daniel Lim Wee Soong
ceeb2810fe Add nullptr check to LogEntry 
Also remove explicit comparison with nullptr to make code shorter.
 2018-03-20 14:15:48 +08:00
Weiyi Wang
9e4f670ea9
Merge pull request #3484 from wwylele/highlight-fix 
pica/lighting: compute highlight clamp after one-/two-sided diffuse pass
 2018-03-18 23:41:27 +02:00
Weiyi Wang
42ed0254db
Merge pull request #3528 from BreadFish64/auto-nvidia 
use nvidia graphics automatically on laptops with optimus
 2018-03-18 23:41:08 +02:00
Mat M
79d1bcf5ba
Merge pull request #3506 from MerryMage/mov-gl_resource_manager 
gl_resource_manager: Use std::exchange in move assignment operators and constructors
 2018-03-17 16:30:58 -04:00
Daniel Lim Wee Soong
2b4998a122 Add check if filter is not a nullptr 
Fix segfault and pass tests
 2018-03-17 22:55:57 +08:00
Weiyi Wang
171cb4452f
Merge pull request #3498 from wwylele/cfg-new-framework 
Service/CFG: convert to ServiceFramework
 2018-03-17 13:54:29 +02:00
Markus Wick
ac92664aa7 OGL: Use stream buffer for vertex data. 2018-03-17 02:02:39 +01:00
Phantom
50598fbbf4 stream buffer 2018-03-17 02:02:39 +01:00
MerryMage
e3f9bfd850 gl_resource_manager: Use std::exchange instead of std::swap in move assignment operators and constructors 
Move assignment operators and move constructors should ideally leave the object moved from in a state where resources aren't accessable.
 2018-03-16 23:47:49 +00:00
BreadFish64
691aadb6a3 comment 2018-03-16 16:06:33 -05:00
Cameron Cawley
8d1cab4892 CMake: Set EMU_ARCH_BITS in CMakeLists.txt 2018-03-16 13:29:36 +00:00
Daniel Lim Wee Soong
c4f98c1a2e Logging: Fix clang-format 2018-03-16 21:18:45 +08:00
Daniel Lim Wee Soong
b5532babab Merge remote-tracking branch 'citra/master' into fmtlib-macros 2018-03-16 20:50:52 +08:00
Starlet
935bcdbd20 Convert ACT to the new service framework (#3521) 
* Convert ACT to the new service framework

* Fix clang-format

* le updates to fix stuff

* Fixed one last thing.

* Well, I fucked up.

* Quick hotfix
 2018-03-16 11:36:35 +02:00
Daniel Lim Wee Soong
327901e145 citra_qt: Remove reference to debugger/console 2018-03-16 12:24:16 +08:00
Daniel Lim Wee Soong
98e669cf00 Remove all edits not in the scope of this PR 2018-03-16 12:17:14 +08:00
Daniel Lim Wee Soong
373efd3158 Logging: Remove customizable logging backends 
Separate code for customizing logging backends from this branch
 2018-03-16 11:56:40 +08:00
Daniel Lim Wee Soong
eee388588e Logging: Fix fmt errors after rebasing with master 
fmt was updated during the clang-format update, which breaks the previous implementation of FmtLogMessage

Changes were:
* Move definition of FmtLogMessage into log.h to use variadic templates as FMT_VARIADIC was removed

To supplement the change above:
* Move Entry and CreateEntry into log.h
* Add LogEntry in backend.cpp
 2018-03-16 11:48:33 +08:00
James Rowe
ab4ba71f3e fixup! Prevent crashes on closing by waiting for the impl thread 2018-03-16 11:18:06 +08:00
James Rowe
87bc5266ef Logging: Various logging improvements 
* Uses PopWait to reduce the amount of busy waiting if there aren't many
new logs
* Opens the log file as shared on windows, letting other programs read
the logs, but not write to them while citra is running
* Flushes the logs to disk if a log >= error arrives
 2018-03-16 11:18:06 +08:00